添加知识库权限控制功能

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUser.java

@@ -76,9 +76,9 @@ public class SysUser extends TenantEntity {
      * 密码
      */
     @TableField(
-        insertStrategy = FieldStrategy.NOT_EMPTY,
-        updateStrategy = FieldStrategy.NOT_EMPTY,
-        whereStrategy = FieldStrategy.NOT_EMPTY
+            insertStrategy = FieldStrategy.NOT_EMPTY,
+            updateStrategy = FieldStrategy.NOT_EMPTY,
+            whereStrategy = FieldStrategy.NOT_EMPTY
     )
     private String password;
 
@@ -113,13 +113,19 @@ public class SysUser extends TenantEntity {
      */
     private String remark;
 
-    /** 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序 */
+    /**
+     * 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序
+     */
     private String openId;
 
-    /** 用户余额 */
+    /**
+     * 用户余额
+     */
     private Double userBalance;
 
-    /** 用户等级 */
+    /**
+     * 用户等级
+     */
     private String userGrade;
 
     public SysUser(Long userId) {
@@ -130,4 +136,14 @@ public class SysUser extends TenantEntity {
         return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
     }
 
+    /**
+     * 知识库角色组类型（role/roleGroup）
+     */
+    private String kroleGroupType;
+
+    /**
+     * 知识库角色组id（role/roleGroup）
+     */
+    private String kroleGroupIds;
+
 }

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/bo/SysUserBo.java

@@ -120,13 +120,19 @@ public class SysUserBo extends BaseEntity {
      */
     private Long roleId;
 
-    /** 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序 */
+    /**
+     * 普通用户的标识,对当前开发者帐号唯一。一个openid对应一个公众号或小程序
+     */
     private String openId;
 
-    /** 用户等级 */
+    /**
+     * 用户等级
+     */
     private String userGrade;
 
-    /** 用户余额 */
+    /**
+     * 用户余额
+     */
     private Double userBalance;
 
     public SysUserBo(Long userId) {
@@ -137,4 +143,14 @@ public class SysUserBo extends BaseEntity {
         return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
     }
 
+    /**
+     * 知识库角色组类型（role/roleGroup）
+     */
+    private String kroleGroupType;
+
+    /**
+     * 知识库角色组id（role/roleGroup）
+     */
+    private String kroleGroupIds;
+
 }

ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/vo/SysUserVo.java

@@ -147,9 +147,23 @@ public class SysUserVo implements Serializable {
      */
     private Long roleId;
 
-    /** 用户等级 */
+    /**
+     * 用户等级
+     */
     private String userGrade;
 
-    /** 用户余额 */
+    /**
+     * 用户余额
+     */
     private Double userBalance;
+
+    /**
+     * 知识库角色组类型（role/roleGroup）
+     */
+    private String kroleGroupType;
+
+    /**
+     * 知识库角色组id（role/roleGroup）
+     */
+    private String kroleGroupIds;
 }

ruoyi-modules-api/ruoyi-system-api/src/main/resources/mapper/SysUserMapper.xml

@@ -44,6 +44,8 @@
                u.create_by,
                u.create_time,
                u.remark,
+               u.krole_group_type,
+               u.krole_group_ids,
                d.dept_id,
                d.parent_id,
                d.ancestors,
@@ -58,50 +60,99 @@
                r.data_scope,
                r.status as role_status
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-            left join sys_user_role sur on u.user_id = sur.user_id
-            left join sys_role r on r.role_id = sur.role_id
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
     </sql>
 
     <update id="updateXcxUser">
         update sys_user
         set nick_name = #{nickName},
             wx_avatar = #{wxAvatar}
-            WHERE user_id = #{userId}
+        WHERE user_id = #{userId}
     </update>
 
     <select id="selectPageUserList" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,u.user_balance,u.user_grade,u.domain_name,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+        select u.user_id,
+               u.dept_id,
+               u.nick_name,
+               u.user_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.sex,
+               u.user_balance,
+               u.user_grade,
+               u.domain_name,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_name,
+               d.leader
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUserList" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,u.user_grade,u.user_balance,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+        select u.user_id,
+               u.dept_id,
+               u.nick_name,
+               u.user_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.sex,
+               u.user_grade,
+               u.user_balance,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_name,
+               d.leader
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id,
+                        u.dept_id,
+                        u.user_name,
+                        u.nick_name,
+                        u.email,
+                        u.phonenumber,
+                        u.status,
+                        u.create_time
         from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUnallocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id,
+                        u.dept_id,
+                        u.user_name,
+                        u.nick_name,
+                        u.email,
+                        u.phonenumber,
+                        u.status,
+                        u.create_time
         from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">