|
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -185,20 +186,28 @@ public class OkrController {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ List<String> userListFilter = new ArrayList<>();
|
|
//同步人是否重复校验
|
|
//同步人是否重复校验
|
|
List<UserInfoDto> memberList = okrService.getMemberListByUserId(null);
|
|
List<UserInfoDto> memberList = okrService.getMemberListByUserId(null);
|
|
for(String userId:userIdList){
|
|
for(String userId:userIdList){
|
|
|
|
+ int filter = 0;
|
|
for (UserInfoDto memberInfo:memberList){
|
|
for (UserInfoDto memberInfo:memberList){
|
|
if(StringUtils.equals(userId,memberInfo.getUserId())){
|
|
if(StringUtils.equals(userId,memberInfo.getUserId())){
|
|
- result.setSuccess(false);
|
|
|
|
- result.setMessage(memberInfo.getName() + "已是同步人,请重新选择");
|
|
|
|
- return result;
|
|
|
|
|
|
+ //result.setSuccess(false);
|
|
|
|
+ //result.setMessage(memberInfo.getName() + "已是同步人,请重新选择");
|
|
|
|
+ //return result;
|
|
|
|
+ filter = -1;
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if(filter == 0){
|
|
|
|
+ userListFilter.add(userId);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
try {
|
|
try {
|
|
- okrService.insertOkrMember2(userIdList);
|
|
|
|
|
|
+ okrService.insertOkrMember2(userListFilter);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
logger.error(e.getMessage());
|
|
logger.error(e.getMessage());
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|