过滤已授权人员

src/main/java/com/zzsn/knowbase/controller/KbAuthorizedUserController.java

@@ -99,10 +99,11 @@ public class KbAuthorizedUserController {
     public Result<?> thirdpartyUsers(HttpServletRequest httpServletRequest,
                                      @RequestParam(name="name",required = false) String name,
                                      @RequestParam(name="username",required = false) String username,
+                                     @RequestParam(name="knowledgeProjectId",required = false) String knowledgeProjectId,
                                      @RequestParam(name="pageNum",defaultValue = "1") Integer pageNum,
                                      @RequestParam(name="PageSize",defaultValue = "10") Integer PageSize){
         String token = httpServletRequest.getHeader("X-Access-Token");
-        return authorizedUserService.thirdpartyUsers(token,name,username,pageNum,PageSize);
+        return authorizedUserService.thirdpartyUsers(token,name,username,knowledgeProjectId,pageNum,PageSize);
     }
 
     @GetMapping("/getAll")

src/main/java/com/zzsn/knowbase/service/KbAuthorizedUserService.java

@@ -25,7 +25,7 @@ public interface KbAuthorizedUserService extends IService<KbAuthorizedUser> {
 
     Result<?> userPermission(String token);
 
-    Result<?> thirdpartyUsers(String token, String name, String username, Integer pageNum, Integer pageSize);
+    Result<?> thirdpartyUsers(String token, String name, String username, String knowledgeProjectId, Integer pageNum, Integer pageSize);
 
     Result<?> doCheck(String token);
     Result<?> doCheckAndGetUser(String token);

src/main/java/com/zzsn/knowbase/service/impl/KbAuthorizedUserServiceImpl.java

@@ -108,7 +108,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
         }
 
         Map<String, List<KbAuthorizedUser>> reqUsersMap = authorizedUsers.stream().collect(Collectors.groupingBy(KbAuthorizedUser::getUserId));
-
+        //授权用户表中已存在的用户
         List<KbAuthorizedUser> kbAuthorizedUsers = authorizedUserMapper.selectList(Wrappers.<KbAuthorizedUser>lambdaQuery()
                 .in(KbAuthorizedUser::getUserId, authorizedUsers.stream().map(KbAuthorizedUser::getUserId).collect(Collectors.toList())));
 
@@ -125,6 +125,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
             authorizedUsers.forEach(e-> {
                 /**保存授权用户*/
                 e.setStatus("0");
+                e.setCreateBy(SpringContextUtils.getUserInfo().getUsername());
                 e.setCreateTime(new Date());
             });
             super.saveBatch(authorizedUsers);
@@ -197,35 +198,36 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
             kbUserRoleMapService.saveBatch(maps);
             authuserKnowledgeprojectMapService.saveBatch(userknows);
         }else {
-            List<String> collect1 = notExist.stream().map(KbAuthorizedUser::getId).collect(Collectors.toList());
-
+            List<String> ids = authorizedUsers.stream().map(KbAuthorizedUser::getId).collect(Collectors.toList());
+            //删除这个用户下已经授权的信息
+            kbUserRoleMapService.remove(Wrappers.<KbUserRoleMap>lambdaQuery().in(KbUserRoleMap::getUserId,ids));
+            authuserKnowledgeprojectMapService.remove(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery().in(KbAuthuserKnowledgeprojectMap::getAuthUserId,ids));
+            kbAuthuserKnowMapService.remove(Wrappers.<KbAuthuserKnowMap>lambdaQuery().in(KbAuthuserKnowMap::getAuthUserId,ids));
             authorizedUsers.forEach(authorizedUser->{
-
-                if (collect1.contains(authorizedUser.getId())) {
-                    /**插入用户知识库权限关系表*/
-                    if (StringUtils.isNotBlank(authorizedUser.getKnowledgeProjectId())){
-                        KbAuthuserKnowledgeprojectMap kbAuthuserKnowledgeprojectMap = new KbAuthuserKnowledgeprojectMap();
-                        kbAuthuserKnowledgeprojectMap.setAuthUserId(authorizedUser.getId());
-                        kbAuthuserKnowledgeprojectMap.setKnowledgeProjectId(authorizedUser.getKnowledgeProjectId());
-                        kbAuthuserKnowledgeprojectMap.setSign(0);
-                        authuserKnowledgeprojectMapService.save(kbAuthuserKnowledgeprojectMap);
-                    }
-                    /**插入用户角色关系表*/
-                    if (StringUtils.isNotBlank(authorizedUser.getRoleId())){
-                        String roleId = authorizedUser.getRoleId();
-                        List<String> list = Arrays.asList(roleId.split(","));
-                        List<KbUserRoleMap> maps = new ArrayList<>();
-                        list.forEach(e->{
-                            KbUserRoleMap kbUserRoleMap = new KbUserRoleMap();
-                            kbUserRoleMap.setUserId(authorizedUser.getId());
-                            kbUserRoleMap.setRoleId(e);
-                            kbUserRoleMap.setKnowledgeProjectId(authorizedUser.getKnowledgeProjectId());
-                            maps.add(kbUserRoleMap);
-                        });
-                        kbUserRoleMapService.saveBatch(maps);
-                    }
+                /**插入用户知识库权限关系表*/
+                if (StringUtils.isNotBlank(authorizedUser.getKnowledgeProjectId())){
+                    KbAuthuserKnowledgeprojectMap kbAuthuserKnowledgeprojectMap = new KbAuthuserKnowledgeprojectMap();
+                    kbAuthuserKnowledgeprojectMap.setAuthUserId(authorizedUser.getId());
+                    kbAuthuserKnowledgeprojectMap.setKnowledgeProjectId(authorizedUser.getKnowledgeProjectId());
+                    kbAuthuserKnowledgeprojectMap.setSign(0);
+                    authuserKnowledgeprojectMapService.save(kbAuthuserKnowledgeprojectMap);
+                }
+                /**插入用户角色关系表*/
+                if (StringUtils.isNotBlank(authorizedUser.getRoleId())){
+                    String roleId = authorizedUser.getRoleId();
+                    List<String> list = Arrays.asList(roleId.split(","));
+                    List<KbUserRoleMap> maps = new ArrayList<>();
+                    list.forEach(e->{
+                        KbUserRoleMap kbUserRoleMap = new KbUserRoleMap();
+                        kbUserRoleMap.setUserId(authorizedUser.getId());
+                        kbUserRoleMap.setRoleId(e);
+                        kbUserRoleMap.setKnowledgeProjectId(authorizedUser.getKnowledgeProjectId());
+                        maps.add(kbUserRoleMap);
+                    });
+                    kbUserRoleMapService.saveBatch(maps);
                 }
 
+
             });
         }
 
@@ -499,12 +501,28 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
     }
 
     @Override
-    public Result<?> thirdpartyUsers(String token, String name, String username, Integer pageNum, Integer pageSize) {
+    public Result<?> thirdpartyUsers(String token, String name, String username, String knowledgeProjectId, Integer pageNum, Integer pageSize) {
+        //查询出这个节点已经受过权的用户
+        List<KbAuthuserKnowledgeprojectMap> list1 = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery().and(i -> i.eq(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId, knowledgeProjectId).or().eq(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId,"0")));
+        StringBuffer exists = new StringBuffer();
+        if (CollectionUtil.isNotEmpty(list1)){
+            List<String> collect = list1.stream().map(KbAuthuserKnowledgeprojectMap::getAuthUserId).collect(Collectors.toList());
+            List<KbAuthorizedUser> list = super.list(Wrappers.<KbAuthorizedUser>lambdaQuery().select(KbAuthorizedUser::getUserId).in(KbAuthorizedUser::getId, collect));
+            List<String> collect1 = list.stream().map(KbAuthorizedUser::getUserId).collect(Collectors.toList());
+            collect1.forEach(e ->{
+                exists.append(","+e);
+            });
+        }
+        String finalExists = "";
+        if (exists.length()>0){
+            finalExists = exists.substring(1);
+        }
         String body = HttpRequest.get(getusersurl).header("X-Access-Token", token)
                 .form("pageNum",pageNum)
                 .form("pageSize",pageSize)
                 .form("name",name)
                 .form("username",username)
+                .form("excludeIds",finalExists)
                 .execute().body();
         Result bean = JSONUtil.toBean(body, Result.class);