Merge remote-tracking branch 'origin/master'

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

@@ -65,11 +65,13 @@ public class KbAuthorizedUserController {
             @RequestParam(name="name",required = false) String name,
             @RequestParam(name="orgId",required = false) String orgId,
             @RequestParam(name="orgName",required = false) String orgName,
+            @RequestParam(name="knowledgeProjectId",required = false) String knowledgeProjectId,
+            @RequestParam(name="category",required = false) String category,
             @RequestParam(name="pageNum",defaultValue = "1") Integer pageNum,
             @RequestParam(name="PageSize",defaultValue = "10") Integer PageSize
     ){
 
-        return  authorizedUserService.lists(roleId,username,name,orgId,orgName,pageNum,PageSize);
+        return  authorizedUserService.lists(roleId,username,name,orgId,orgName,knowledgeProjectId,category,pageNum,PageSize);
 
     }
 

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

@@ -110,6 +110,11 @@ public class KbAuthorizedUser extends Model<KbAuthorizedUser> {
      */
     @TableField(exist = false)
     private String knowledgeProjectId;
+    /**
+     * 是否有所有节点的权限,0是，1否
+     */
+    @TableField(exist = false)
+    private Integer isAll;
 
 
 }

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

@@ -27,7 +27,7 @@ public class KbAuthuserKnowledgeprojectMap extends Model<KbAuthuserKnowledgeproj
     private Long id;
 
     @TableField("auth_user_id")
-    private Long authUserId;
+    private String authUserId;
 
     @TableField("knowledge_project_id")
     private String knowledgeProjectId;

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

 package com.zzsn.knowbase.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -31,13 +30,18 @@ public class KbUserRoleMap extends Model<KbUserRoleMap> {
      * 授权用户id
      */
     @TableField("user_id")
-    private Long userId;
+    private String userId;
 
     /**
      * 角色id
      */
     @TableField("role_id")
-    private Long roleId;
+    private String roleId;
+    /**
+     * 知识库分类id
+     */
+    @TableField("knowledge_project_id")
+    private String knowledgeProjectId;
 
 
 

src/main/java/com/zzsn/knowbase/mapper/KbAuthorizedUserMapper.java

@@ -24,11 +24,11 @@ public interface KbAuthorizedUserMapper extends BaseMapper<KbAuthorizedUser> {
     @Select("SELECT a.*,GROUP_CONCAT(b.role_id SEPARATOR ',') as roleId,GROUP_CONCAT(c.role_name SEPARATOR ',') as roleName FROM kb_authorized_user a " +
             "LEFT JOIN kb_user_role_map b ON a.id = b.user_id " +
             "LEFT JOIN kb_role c ON c.id = b.role_id " +
-            "${sql}"+
+            "LEFT JOIN kb_authuser_knowledgeproject_map d ON d.auth_user_id = a.id " +
             "${ew.customSqlSegment}"+
             "GROUP BY a.id"
     )
-    IPage<KbAuthorizedUser> page(Page<KbAuthorizedUser> page, @Param(Constants.WRAPPER) QueryWrapper<KbAuthorizedUser> query, String sql);
+    IPage<KbAuthorizedUser> pageList(Page<KbAuthorizedUser> page, @Param(Constants.WRAPPER) QueryWrapper<KbAuthorizedUser> query);
 
 
     @Select("SELECT a.*,GROUP_CONCAT(b.role_id SEPARATOR ',') as roleId,GROUP_CONCAT(c.role_name SEPARATOR ',') as roleName FROM kb_authorized_user a " +

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

@@ -20,7 +20,7 @@ public interface KbAuthorizedUserService extends IService<KbAuthorizedUser> {
 
     Result<?> edit(KbAuthorizedUser authorizedUser);
 
-    Result<?> lists(String roleId, String username, String name, String orgId, String orgName, Integer pageNum, Integer pageSize);
+    Result<?> lists(String roleId, String username, String name, String orgId, String orgName, String knowledgeProjectId, String category, Integer pageNum, Integer pageSize);
 
     Result<?> userPermission(String token);
 

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

@@ -6,13 +6,16 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.knowbase.entity.KbAuthorizedUser;
 import com.zzsn.knowbase.entity.KbAuthuserKnowMap;
 import com.zzsn.knowbase.entity.KbAuthuserKnowledgeprojectMap;
 import com.zzsn.knowbase.entity.KbKnowledgeProject;
 import com.zzsn.knowbase.mapper.KbKnowledgeProjectMapper;
+import com.zzsn.knowbase.service.KbAuthorizedUserService;
 import com.zzsn.knowbase.service.KbAuthuserKnowMapService;
 import com.zzsn.knowbase.service.KbAuthuserKnowledgeprojectMapService;
 import com.zzsn.knowbase.service.KbKnowledgeProjectService;
+import com.zzsn.knowbase.util.SpringContextUtils;
 import com.zzsn.knowbase.vo.Result;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -22,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
-import java.util.logging.LogManager;
 import java.util.stream.Collectors;
 
 /**
@@ -35,10 +37,18 @@ import java.util.stream.Collectors;
  */
 @Service
 public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjectMapper, KbKnowledgeProject> implements KbKnowledgeProjectService {
+
     @Autowired
-    private KbAuthuserKnowMapService authuserKnowMapService;
+    KbAuthorizedUserService kbAuthorizedUserService;
+    @Autowired
+    KbKnowledgeProjectMapper kbKnowledgeProjectMapper;
     @Autowired
-    private KbAuthuserKnowledgeprojectMapService authuserKnowledgeprojectMapService;
+    KbAuthuserKnowledgeprojectMapService authuserKnowledgeprojectMapService;
+    @Autowired
+    KbAuthuserKnowMapService kbAuthuserKnowMapService;
+
+    @Autowired
+    private KbAuthuserKnowMapService authuserKnowMapService;
     @Override
     @Transactional
     public Result<?> add(KbKnowledgeProject knowledgeProject) {
@@ -67,6 +77,13 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
         return Result.OK();
     }
 
+    public List<KbAuthuserKnowledgeprojectMap> getUserKnowProjectMapByUserId(String userId){
+        //用户所拥有权限的知识库分类集合
+        List<KbAuthuserKnowledgeprojectMap> list = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery().eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, userId));
+        List<KbAuthuserKnowMap> list1 = kbAuthuserKnowMapService.list(Wrappers.<KbAuthuserKnowMap>lambdaQuery().eq(KbAuthuserKnowMap::getAuthUserId, userId));
+        return list;
+    }
+
     @Override
     @Transactional
     public Result<?> edit(KbKnowledgeProject knowledgeProject) {
@@ -134,6 +151,7 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
     @Override
     public Result<?> lists(String sign, String projectId, String category) {
 
+        KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
 
         //这个用户所拥有的所有的分类的权限
 //        List<KbAuthuserKnowledgeprojectMap> list = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery().eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, one.getId()));