Browse Source

OKR增加同步人接口调整

hcst_sunzhen 4 năm trước cách đây
mục cha
commit
18f1bed6e8

+ 2 - 0
src/main/java/cn/com/ctop/okr/config/ShiroConfig.java

@@ -149,6 +149,8 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/callback/qywexin", "anon");
         filterChainDefinitionMap.put("/qywx/departAndUser", "anon");
+
+        //TODO
         //filterChainDefinitionMap.put("/corp/*", "anon");
         //filterChainDefinitionMap.put("/okr/*", "anon");
         //filterChainDefinitionMap.put("/feishu/*", "anon");

+ 13 - 4
src/main/java/cn/com/ctop/okr/controller/OkrController.java

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