Browse Source

feature: 系统管理->用户管理功能

autumnal_wind@yeah.net 1 month ago
parent
commit
599b0f47c7

+ 3 - 3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java

@@ -48,13 +48,13 @@ public class SysUserBo extends BaseEntity {
48 48
     /**
49 49
      * 学/工号
50 50
      */
51
+    @Xss(message = "学/工号不能包含脚本字符")
52
+    @NotBlank(message = "学/工号不能为空")
53
+    @Size(min = 0, max = 30, message = "学/工号长度不能超过{max}个字符")
51 54
     private String userNumb;
52 55
     /**
53 56
      * 用户昵称
54 57
      */
55
-    @Xss(message = "用户昵称不能包含脚本字符")
56
-    @NotBlank(message = "用户昵称不能为空")
57
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
58 58
     private String nickName;
59 59
     /**
60 60
      * 用户姓名

+ 9 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -306,9 +306,12 @@ public class SysUserServiceImpl implements ISysUserService {
306 306
         SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
307 307
         // 新增用户信息
308 308
         int rows = baseMapper.insert(sysUser);
309
-        user.setUserId(sysUser.getUserId());
309
+        if (sysUser != null) {
310
+            user.setUserId(sysUser.getUserId());
311
+        }
310 312
         // 新增用户岗位关联
311
-        insertUserPost(user, false);
313
+        //insertUserPost(user, false);
314
+        insertUserDept(user,false);
312 315
         // 新增用户与角色管理
313 316
         insertUserRole(user, false);
314 317
         return rows;
@@ -632,4 +635,8 @@ public class SysUserServiceImpl implements ISysUserService {
632 635
         return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail();
633 636
     }
634 637
 
638
+    private void insertUserDept(SysUserBo bo,Boolean clear){
639
+        Long deptId =  bo.getDeptId();
640
+
641
+    }
635 642
 }

+ 25 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserDeptMapper.xml

@@ -0,0 +1,25 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper
3
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
+<mapper namespace="org.dromara.system.right.mapper.UserDeptMapper">
6
+
7
+    <resultMap type="org.dromara.system.right.domain.UserDept" id="UserDeptResult">
8
+            <result property="userDeptId"    column="user_dept_id"    />
9
+            <result property="tenantId"    column="tenant_id"    />
10
+            <result property="userId"    column="user_id"    />
11
+            <result property="deptId"    column="dept_id"    />
12
+            <result property="postId"    column="post_id"    />
13
+            <result property="mainDept"    column="main_dept"    />
14
+            <result property="checkStatus"    column="check_status"    />
15
+            <result property="checkDate"    column="check_date"    />
16
+            <result property="payStatus"    column="pay_status"    />
17
+            <result property="payDate"    column="pay_date"    />
18
+            <result property="delFlag"    column="del_flag"    />
19
+            <result property="createDept"    column="create_dept"    />
20
+            <result property="createBy"    column="create_by"    />
21
+            <result property="createTime"    column="create_time"    />
22
+            <result property="updateBy"    column="update_by"    />
23
+            <result property="updateTime"    column="update_time"    />
24
+    </resultMap>
25
+</mapper>