Merge remote-tracking branch 'origin/master'

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

@@ -369,6 +369,25 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
                     saves1.add(kbAuthuserKnowledgeprojectMap);
                 }
             }
+            /**清除用户知识库角色关系表*/
+            kbUserRoleMapService.remove(Wrappers.<KbUserRoleMap>lambdaQuery().eq(KbUserRoleMap::getUserId,user.getId()).eq(KbUserRoleMap::getKnowledgeProjectId,user.getKnowledgeProjectId()));
+            /**插入用户角色关系表*/
+            List<KbUserRoleMap> maps = new ArrayList<>();
+
+            if (StringUtils.isNotBlank(user.getRoleId())){
+                String roleId = user.getRoleId();
+                List<String> lists = Arrays.asList(roleId.split(","));
+                lists.forEach(ee->{
+                    KbUserRoleMap kbUserRoleMap = new KbUserRoleMap();
+                    kbUserRoleMap.setUserId(user.getId());
+                    kbUserRoleMap.setRoleId(ee);
+                    kbUserRoleMap.setKnowledgeProjectId(addUserPermissKnowsVo.getKnowledgeProjectId());
+                    kbUserRoleMap.setCreateDate(new Date());
+                    maps.add(kbUserRoleMap);
+                });
+            }
+            kbUserRoleMapService.saveBatch(maps);
+
 
             knowledgeIds.forEach(know->{
                 KbAuthuserKnowMap kbAuthuserKnowMap = new KbAuthuserKnowMap();