Sfoglia il codice sorgente

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

autumnal_wind@yeah.net 1 anno fa
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 {
     /**
      * 学/工号
      */
+    @Xss(message = "学/工号不能包含脚本字符")
+    @NotBlank(message = "学/工号不能为空")
+    @Size(min = 0, max = 30, message = "学/工号长度不能超过{max}个字符")
     private String userNumb;
     /**
      * 用户昵称
      */
-    @Xss(message = "用户昵称不能包含脚本字符")
-    @NotBlank(message = "用户昵称不能为空")
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
     private String nickName;
     /**
      * 用户姓名

+ 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 {
         SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
         // 新增用户信息
         int rows = baseMapper.insert(sysUser);
-        user.setUserId(sysUser.getUserId());
+        if (sysUser != null) {
+            user.setUserId(sysUser.getUserId());
+        }
         // 新增用户岗位关联
-        insertUserPost(user, false);
+        //insertUserPost(user, false);
+        insertUserDept(user,false);
         // 新增用户与角色管理
         insertUserRole(user, false);
         return rows;
@@ -632,4 +635,8 @@ public class SysUserServiceImpl implements ISysUserService {
         return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail();
     }
 
+    private void insertUserDept(SysUserBo bo,Boolean clear){
+        Long deptId =  bo.getDeptId();
+
+    }
 }

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.right.mapper.UserDeptMapper">
+
+    <resultMap type="org.dromara.system.right.domain.UserDept" id="UserDeptResult">
+            <result property="userDeptId"    column="user_dept_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="userId"    column="user_id"    />
+            <result property="deptId"    column="dept_id"    />
+            <result property="postId"    column="post_id"    />
+            <result property="mainDept"    column="main_dept"    />
+            <result property="checkStatus"    column="check_status"    />
+            <result property="checkDate"    column="check_date"    />
+            <result property="payStatus"    column="pay_status"    />
+            <result property="payDate"    column="pay_date"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+    </resultMap>
+</mapper>