feat: 用户管理加入部门相关字段

Author: cadecode

framework/framework_base/src/main/java/com/github/cadecode/uniboot/framework/base/security/model/SysUserDetails.java

@@ -29,6 +29,10 @@ public class SysUserDetails implements UserDetails {
 
     private String nickName;
 
+    private Long deptId;
+
+    private String deptName;
+
     private Boolean enableFlag;
 
     private String sex;

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/bean/po/SysUser.java

@@ -43,6 +43,11 @@ public class SysUser {
      */
     private String nickName;
 
+    /**
+     * 部门 ID
+     */
+    private Long deptId;
+
     /**
      * 是否启用
      */

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/bean/vo/SysUserVo.java

@@ -44,6 +44,7 @@ public static class SysUserModifyPassReqVo {
     public static class SysUserRolesReqVo extends PageParams {
         private String username;
         private String nickName;
+        private Long deptId;
         private List<Long> roleIdList;
         private Boolean enableFlag;
     }
@@ -64,6 +65,7 @@ public static class SysUserUpdateReqVo {
         private String username;
         @NotEmpty
         private String nickName;
+        private Long deptId;
         private String password;
         private String phone;
         @Email
@@ -78,6 +80,8 @@ public static class SysUserAddReqVo {
         private String username;
         @NotEmpty
         private String nickName;
+        @NotNull
+        private Long deptId;
         @NotEmpty
         private String password;
         private String phone;
@@ -93,32 +97,21 @@ public static class SysUserAddReqVo {
     public static class SysUserRolesResVo {
 
         private Long id;
-
         private String username;
-
         @JsonIgnore
         private String password;
-
         private String nickName;
-
+        private Long deptId;
+        private String deptName;
         private Boolean enableFlag;
-
         private String sex;
-
         private String mail;
-
         private String phone;
-
         private String loginIp;
-
         private Date loginDate;
-
         private Date createTime;
-
         private Date updateTime;
-
         private String updateUser;
-
         private List<String> roles;
     }
 

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/convert/SysUserConvert.java

@@ -31,6 +31,7 @@ public interface SysUserConvert {
     @Mapping(target = "createTime", ignore = true)
     SysUser voToPo(SysUserAddReqVo reqVo);
 
+    @Mapping(target = "deptId", ignore = true)
     @Mapping(target = "username", ignore = true)
     @Mapping(target = "updateUser", ignore = true)
     @Mapping(target = "updateTime", ignore = true)

framework/framework_svc/src/main/resources/mapper/SysUserMapper.xml

@@ -5,6 +5,8 @@
         <result column="id" property="id"/>
         <result column="username" property="username"/>
         <result column="nick_name" property="nickName"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="nick_name" property="nickName"/>
         <result column="password" property="password"/>
         <result column="enable_flag" property="enableFlag" typeHandler="BoolToIntTypeHandler"/>
         <result column="sex" property="sex"/>
@@ -15,13 +17,15 @@
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_user" property="updateUser"/>
+        <result column="d_dept_name" property="deptName"/>
         <result column="r_code" property="roles" typeHandler="ObjToStrTypeHandler"/>
     </resultMap>
     <select id="selectRolesVoByUserIds" resultMap="SysUserRolesVoMap">
-        SELECT su.*, JSON_ARRAYAGG(sr.code) r_code
+        SELECT su.*, JSON_ARRAYAGG(sr.code) r_code, sd.dept_name d_dept_name
         FROM sys_user su
         LEFT JOIN sys_role_user sru ON sru.user_id = su.id
         LEFT JOIN sys_role sr ON sru.role_id = sr.id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
         <if test="userIds != null and userIds.size > 0">
             WHERE su.id IN (
             <foreach collection="userIds" item="id" separator=",">
@@ -33,18 +37,20 @@
         ORDER BY su.create_time DESC
     </select>
     <select id="selectRolesVoByUsername" resultMap="SysUserRolesVoMap">
-        SELECT su.*, JSON_ARRAYAGG(sr.code) r_code
+        SELECT su.*, JSON_ARRAYAGG(sr.code) r_code, sd.dept_name d_dept_name
         FROM sys_user su
         LEFT JOIN sys_role_user sru ON sru.user_id = su.id
         LEFT JOIN sys_role sr ON sru.role_id = sr.id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
         WHERE su.username = #{username}
         GROUP BY su.id
     </select>
     <select id="selectRolesVo" resultMap="SysUserRolesVoMap">
-        SELECT su.*, JSON_ARRAYAGG(sr.code) r_code
+        SELECT su.*, JSON_ARRAYAGG(sr.code) r_code, sd.dept_name d_dept_name
         FROM sys_user su
         LEFT JOIN sys_role_user sru ON sru.user_id = su.id
         LEFT JOIN sys_role sr ON sru.role_id = sr.id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
         <if test="req != null">
             <where>
                 <if test="req.username != null and req.username.length > 0">
@@ -55,6 +61,9 @@
                     <bind name="binNickName" value="'%' + req.nickName + '%'"/>
                     AND su.nick_name like #{binNickName}
                 </if>
+                <if test="req.deptId != null">
+                    AND su.dept_id = #{req.deptId}
+                </if>
                 <if test="req.enableFlag != null">
                     AND su.enable_flag = #{req.enableFlag, typeHandler=BoolToIntTypeHandler}
                 </if>