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

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java

@@ -71,7 +71,7 @@ public class SysProfileController extends BaseController {
         SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);
         user.setUserId(LoginHelper.getUserId());
         String username = LoginHelper.getUsername();
-        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+        if (StringUtils.isNotEmpty(user.getPhone()) && !userService.checkPhoneUnique(user)) {
             return R.fail("修改用户'" + username + "'失败，手机号码已存在");
         }
         if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -156,7 +156,7 @@ public class SysUserController extends BaseController {
         deptService.checkDeptDataScope(user.getDeptId());
         if (!userService.checkUserNameUnique(user)) {
             return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+        } else if (StringUtils.isNotEmpty(user.getPhone()) && !userService.checkPhoneUnique(user)) {
             return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
@@ -182,7 +182,7 @@ public class SysUserController extends BaseController {
         deptService.checkDeptDataScope(user.getDeptId());
         if (!userService.checkUserNameUnique(user)) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+        } else if (StringUtils.isNotEmpty(user.getPhone()) && !userService.checkPhoneUnique(user)) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");

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

@@ -43,6 +43,10 @@ public class SysUser extends TenantEntity {
      * 用户账号
      */
     private String userName;
+    /**
+     * 学/工号
+     */
+    private String userNumb;
 
     /**
      * 用户昵称

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

@@ -33,7 +33,10 @@ public class SysUserBo extends BaseEntity {
      * 部门ID
      */
     private Long deptId;
-
+    /**
+     * 岗位Id
+     */
+    private Long postId;
     /**
      * 用户账号
      */
@@ -42,6 +45,10 @@ public class SysUserBo extends BaseEntity {
     @Size(min = 0, max = 30, message = "用户账号长度不能超过{max}个字符")
     private String userName;
 
+    /**
+     * 学/工号
+     */
+    private String userNumb;
     /**
      * 用户昵称
      */
@@ -49,12 +56,20 @@ public class SysUserBo extends BaseEntity {
     @NotBlank(message = "用户昵称不能为空")
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
     private String nickName;
-
+    /**
+     * 用户姓名
+     */
+    private String realName;
     /**
      * 用户类型（sys_user系统用户）
      */
     private String userType;
 
+    /**
+     * 用户身份（0=内部用户 1=老师 2=学生 3=家长  4=其他人员）
+     */
+    private String category;
+    /**
     /**
      * 用户邮箱
      */
@@ -65,7 +80,7 @@ public class SysUserBo extends BaseEntity {
     /**
      * 手机号码
      */
-    private String phonenumber;
+    private String phone;
 
     /**
      * 用户性别（0男 1女 2未知）

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

@@ -43,11 +43,18 @@ public class SysUserVo implements Serializable {
      */
     private Long deptId;
 
+    /**
+     * 岗位Id
+     */
+    private Long postId;
     /**
      * 用户账号
      */
     private String userName;
-
+    /**
+     * 学/工号
+     */
+    private String userNumb;
     /**
      * 用户昵称
      */
@@ -62,6 +69,11 @@ public class SysUserVo implements Serializable {
      */
     private String userType;
 
+    /**
+     * 用户身份（0=内部用户 1=老师 2=学生 3=家长  4=其他人员）
+     */
+    private String category;
+    /**
     /**
      * 用户邮箱
      */

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

@@ -84,7 +84,7 @@ public class SysUserServiceImpl implements ISysUserService {
             .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
             .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
             .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
+            .like(StringUtils.isNotBlank(user.getPhone()), "u.phone", user.getPhone())
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 "u.create_time", params.get("beginTime"), params.get("endTime"))
             .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
@@ -114,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService {
             .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
             .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
             .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
+            .like(StringUtils.isNotBlank(user.getPhone()), "u.phone", user.getPhone())
             .orderByAsc("u.user_id");
         Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
         return TableDataInfo.build(page);
@@ -134,7 +134,7 @@ public class SysUserServiceImpl implements ISysUserService {
             .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
             .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
             .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
-            .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phone", user.getPhonenumber())
+            .like(StringUtils.isNotBlank(user.getPhone()), "u.phone", user.getPhone())
             .orderByAsc("u.user_id");
         Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
         return TableDataInfo.build(page);
@@ -246,7 +246,7 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     public boolean checkPhoneUnique(SysUserBo user) {
         boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
-            .eq(SysUser::getPhone, user.getPhonenumber())
+            .eq(SysUser::getPhone, user.getPhone())
             .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
         return !exist;
     }
@@ -391,7 +391,7 @@ public class SysUserServiceImpl implements ISysUserService {
         return baseMapper.update(null,
             new LambdaUpdateWrapper<SysUser>()
                 .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName())
-                .set(SysUser::getPhone, user.getPhonenumber())
+                .set(SysUser::getPhone, user.getPhone())
                 .set(SysUser::getEmail, user.getEmail())
                 .set(SysUser::getSex, user.getSex())
                 .eq(SysUser::getUserId, user.getUserId()));

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

@@ -17,8 +17,7 @@
             ${ew.getSqlSelect}
         </if>
         <if test="ew.getSqlSelect == null">
-            u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
+            u.user_id, u.tenant_id,u.post_id, u.dept_id, u.user_name, u.password, u.user_numb, u.nick_name, u.real_name, u.sex,u.category, u.email, u.address, u.phone, u.avatar, u.id_number, u.user_attr, u.photo,u.formation, u.hidden, u.other_id,u.user_state, u.remark, login_ip, login_date, status, del_flag, create_dept, create_by, u.create_time, u.update_by, u.update_time, u.user_type
         </if>
         from t_sys_user u
         ${ew.getCustomSqlSegment}
@@ -30,8 +29,7 @@
             ${ew.getSqlSelect}
         </if>
         <if test="ew.getSqlSelect == null">
-            u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone, u.sex,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
+            u.user_id, u.tenant_id,u.post_id, u.dept_id, u.user_name, u.password, u.user_numb, u.nick_name, u.real_name, u.sex,u.category, u.email, u.address, u.phone, u.avatar, u.id_number, u.user_attr, u.photo,u.formation, u.hidden, u.other_id,u.user_state, u.remark, login_ip, login_date, status, del_flag, create_dept, create_by, u.create_time, u.update_by, u.update_time, u.user_type
         </if>
         from t_sys_user u
         ${ew.getCustomSqlSegment}