添加

src/main/java/com/zzsn/knowbase/entity/KbAuthuserKnowMap.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  *
@@ -34,7 +36,8 @@ public class KbAuthuserKnowMap extends Model<KbAuthuserKnowMap> {
 
     @TableField("knowledge_project_id")
     private String knowledgeProjectId;
-
+    @TableField("create_date")
+    private Date createDate;
 
 
 }

src/main/java/com/zzsn/knowbase/entity/KbAuthuserKnowledgeprojectMap.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  *
@@ -38,6 +40,9 @@ public class KbAuthuserKnowledgeprojectMap extends Model<KbAuthuserKnowledgeproj
     @TableField("sign")
     private Integer sign;
 
+    @TableField("create_date")
+    private Date createDate;
+
 
 
 

src/main/java/com/zzsn/knowbase/entity/KbUserRoleMap.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  *
@@ -43,6 +45,7 @@ public class KbUserRoleMap extends Model<KbUserRoleMap> {
     @TableField("knowledge_project_id")
     private String knowledgeProjectId;
 
-
+    @TableField("create_date")
+    private Date createDate;
 
 }

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

@@ -20,10 +20,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -97,24 +94,40 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
     }
 
     @Override
-    public Result<?> add(List<KbAuthorizedUser> authorizedUsers) {
+    public Result<?> add(List<KbAuthorizedUser>   authorizedUsers) {
 
         if (CollectionUtil.isEmpty(authorizedUsers)){
             return  Result.error("请选择要授权的用户");
         }
 
-        List<KbAuthorizedUser> kbAuthorizedUsers = authorizedUserMapper.selectList(Wrappers.<KbAuthorizedUser>lambdaQuery().in(KbAuthorizedUser::getUserId, authorizedUsers.stream().map(KbAuthorizedUser::getUserId).collect(Collectors.toList())));
+        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())));
+
         List<String> collect = kbAuthorizedUsers.stream().map(KbAuthorizedUser::getUserId).collect(Collectors.toList());
 
+
         //已经授权过的用户在用户表里不用重复插入
         List<KbAuthorizedUser> notExist = authorizedUsers.stream().filter(f -> !collect.contains(f.getUserId())).collect(Collectors.toList());
-        notExist.forEach(e-> {
-            /**保存授权用户*/
-            e.setStatus("0");
-            e.setCreateTime(new Date());
-        });
 
-        super.saveBatch(notExist);
+        authorizedUsers = new ArrayList<>();
+        authorizedUsers.addAll(notExist);
+
+        if (CollectionUtil.isNotEmpty(authorizedUsers)) {
+            authorizedUsers.forEach(e-> {
+                /**保存授权用户*/
+                e.setStatus("0");
+                e.setCreateTime(new Date());
+            });
+            super.saveBatch(authorizedUsers);
+        }
+        if (CollectionUtil.isNotEmpty(kbAuthorizedUsers)){
+            kbAuthorizedUsers.forEach(e->{
+                e.setRoleId(reqUsersMap.get(e.getUserId()).get(0).getRoleId());
+            });
+            authorizedUsers.addAll(kbAuthorizedUsers);
+        }
 
         //获取这一批下面的其中一个用户，获取这批用户关联的知识库分类
         KbAuthorizedUser kbAuthorizedUser = authorizedUsers.get(0);
@@ -134,6 +147,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
                         kbAuthuserKnowledgeprojectMap.setAuthUserId(authorizedUser.getId());
                         kbAuthuserKnowledgeprojectMap.setKnowledgeProjectId(e.getId());
                         kbAuthuserKnowledgeprojectMap.setSign(0);
+                        kbAuthuserKnowledgeprojectMap.setCreateDate(new Date());
                         userknows.add(kbAuthuserKnowledgeprojectMap);
                         /**插入用户角色关系表*/
                         if (StringUtils.isNotBlank(authorizedUser.getRoleId())){
@@ -144,6 +158,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
                                 kbUserRoleMap.setUserId(authorizedUser.getId());
                                 kbUserRoleMap.setRoleId(ee);
                                 kbUserRoleMap.setKnowledgeProjectId(e.getId());
+                                kbUserRoleMap.setCreateDate(new Date());
                                 maps.add(kbUserRoleMap);
                             });
                         }
@@ -221,6 +236,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
         query.eq(StringUtils.isNotBlank(orgId),"a.org_id",orgId);
         query.eq(StringUtils.isNotBlank(roleId),"b.role_id",roleId);
         query.eq(StringUtils.isNotBlank(knowledgeProjectId),"d.knowledge_project_id",knowledgeProjectId);
+        query.eq(StringUtils.isNotBlank(knowledgeProjectId),"b.knowledge_project_id",knowledgeProjectId);
         query.like(StringUtils.isNotBlank(name),"a.name",name);
         query.like(StringUtils.isNotBlank(orgName),"a.org_name",orgName);