【ADD】部门增加备注字段，用户增加生日、微信、姓名等字段

railway-admin/src/main/java/com/railway/web/controller/system/SysProfileController.java

@@ -65,7 +65,7 @@ public class SysProfileController extends BaseController {
   @Log(title = "个人信息", businessType = BusinessType.UPDATE)
   @PutMapping
   public AjaxResult updateProfile(@RequestBody SysUser user) {
-    if (StringUtils.isNotEmpty(user.getPhonenumber())
+    if (StringUtils.isNotEmpty(user.getPhone())
         && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
       return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
     }
@@ -80,7 +80,7 @@ public class SysProfileController extends BaseController {
     if (userService.updateUserProfile(user) > 0) {
       // 更新缓存用户信息
       sysUser.setNickName(user.getNickName());
-      sysUser.setPhonenumber(user.getPhonenumber());
+      sysUser.setPhone(user.getPhone());
       sysUser.setEmail(user.getEmail());
       sysUser.setSex(user.getSex());
       tokenService.setLoginUser(loginUser);

railway-admin/src/main/java/com/railway/web/controller/system/SysUserController.java

@@ -8,7 +8,6 @@ import com.railway.common.core.domain.entity.SysRole;
 import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.enums.BusinessType;
-import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.ExcelUtil;
 import com.railway.system.service.ISysPostService;
@@ -121,7 +120,7 @@ public class SysUserController extends BaseController {
   public AjaxResult add(@Validated @RequestBody SysUser user) {
     if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
       return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-    } else if (StringUtils.isNotEmpty(user.getPhonenumber())
+    } else if (StringUtils.isNotEmpty(user.getPhone())
         && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
       return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
     } else if (StringUtils.isNotEmpty(user.getEmail())
@@ -141,7 +140,7 @@ public class SysUserController extends BaseController {
   @PutMapping
   public AjaxResult edit(@Validated @RequestBody SysUser user) {
     userService.checkUserAllowed(user);
-    if (StringUtils.isNotEmpty(user.getPhonenumber())
+    if (StringUtils.isNotEmpty(user.getPhone())
         && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
       return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
     } else if (StringUtils.isNotEmpty(user.getEmail())

railway-common/src/main/java/com/railway/common/core/domain/entity/SysUser.java

@@ -54,16 +54,23 @@ public class SysUser extends BaseEntity {
    */
   @NotBlank(message = "登录账号不能为空")
   @Size(max = 30, message = "登录账号长度不能超过30个字符")
-  @Excel(name = "登录名称")
+  @Excel(name = "登录用户名")
   private String userName;
 
   /**
-   * 用户名称
+   * 用户昵称（工号）
    */
   @Size(max = 30, message = "用户昵称长度不能超过30个字符")
-  @Excel(name = "用户名称")
+  @Excel(name = "工号")
   private String nickName;
 
+  /**
+   * 员工姓名
+   */
+  @Size(max = 60, message = "用户姓名长度不能超过60个字符")
+  @Excel(name = "员工姓名")
+  private String realName;
+
   /**
    * 用户类型
    */
@@ -82,7 +89,14 @@ public class SysUser extends BaseEntity {
    */
   @Size(max = 11, message = "手机号码长度不能超过11个字符")
   @Excel(name = "手机号码")
-  private String phonenumber;
+  private String phone;
+
+  /**
+   * 微信号
+   */
+  @Size(max = 64, message = "微信号长度不能超过64个字符")
+  @Excel(name = "微信号")
+  private String wechat;
 
   /**
    * 用户性别
@@ -90,6 +104,12 @@ public class SysUser extends BaseEntity {
   @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
   private String sex;
 
+  /**
+   * 出生日期
+   */
+  @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd", type = Type.EXPORT)
+  private Date birthday;
+
   /**
    * 用户头像
    */

railway-system/src/main/java/com/railway/system/mapper/SysUserMapper.java

@@ -114,10 +114,10 @@ public interface SysUserMapper {
   /**
    * 校验手机号码是否唯一
    *
-   * @param phonenumber 手机号码
+   * @param phone 手机号码
    * @return 结果
    */
-  SysUser checkPhoneUnique(String phonenumber);
+  SysUser checkPhoneUnique(String phone);
 
   /**
    * 校验email是否唯一

railway-system/src/main/java/com/railway/system/service/impl/SysUserServiceImpl.java

@@ -171,7 +171,7 @@ public class SysUserServiceImpl implements ISysUserService {
   @Override
   public String checkPhoneUnique(SysUser user) {
     long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-    SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+    SysUser info = userMapper.checkPhoneUnique(user.getPhone());
     if (StringUtils.isNotNull(info) && info.getUserId() != userId) {
       return UserConstants.NOT_UNIQUE;
     }

railway-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -20,11 +20,12 @@
     <result property="createTime" column="create_time"/>
     <result property="updateBy" column="update_by"/>
     <result property="updateTime" column="update_time"/>
+    <result property="remark" column="remark"/>
   </resultMap>
 
   <sql id="selectDeptVo">
     select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone,
-    d.email, d.status, d.del_flag, d.create_by, d.create_time
+    d.email, d.status, d.del_flag, d.create_by, d.create_time, d.remark
     from sys_dept d
   </sql>
 
@@ -100,6 +101,7 @@
     <if test="email != null and email != ''">email,</if>
     <if test="status != null">status,</if>
     <if test="createBy != null and createBy != ''">create_by,</if>
+    <if test="remark != null and remark != ''">remark,</if>
     create_time
     )values(
     <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -112,6 +114,7 @@
     <if test="email != null and email != ''">#{email},</if>
     <if test="status != null">#{status},</if>
     <if test="createBy != null and createBy != ''">#{createBy},</if>
+    <if test="remark != null and remark != ''">#{remark},</if>
     sysdate()
     )
   </insert>
@@ -128,6 +131,7 @@
       <if test="email != null">email = #{email},</if>
       <if test="status != null and status != ''">status = #{status},</if>
       <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+      <if test="remark != null and remark != ''">#{remark},</if>
       update_time = sysdate()
     </set>
     where dept_id = #{deptId}

railway-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -9,9 +9,12 @@
     <result property="deptId" column="dept_id"/>
     <result property="userName" column="user_name"/>
     <result property="nickName" column="nick_name"/>
+    <result property="realName" column="real_name"/>
     <result property="email" column="email"/>
-    <result property="phonenumber" column="phonenumber"/>
+    <result property="phone" column="phone"/>
+    <result property="wechat" column="wechat"/>
     <result property="sex" column="sex"/>
+    <result property="birthday" column="birthday"/>
     <result property="avatar" column="avatar"/>
     <result property="password" column="password"/>
     <result property="status" column="status"/>
@@ -46,9 +49,9 @@
   </resultMap>
 
   <sql id="selectUserVo">
-    select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber,
+    select u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.avatar, u.phone, u.wechat,
     u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time,
-    u.remark,
+    u.remark,u.birthday,
     d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
     r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
     from sys_user u
@@ -58,9 +61,9 @@
   </sql>
 
   <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-    select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,
+    select u.user_id, u.dept_id, u.nick_name, u.user_name, u.real_name, u.email, u.avatar, u.phone, u.wechat,
     u.password, u.sex, 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
+    u.birthday, u.remark, d.dept_name, d.leader from sys_user u
     left join sys_dept d on u.dept_id = d.dept_id
     where u.del_flag = '0'
     <if test="userId != null and userId != 0">
@@ -72,8 +75,8 @@
     <if test="status != null and status != ''">
       AND u.status = #{status}
     </if>
-    <if test="phonenumber != null and phonenumber != ''">
-      AND u.phonenumber like concat('%', #{phonenumber}, '%')
+    <if test="phone != null and phone != ''">
+      AND u.phone like concat('%', #{phone}, '%')
     </if>
     <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
       AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
@@ -90,7 +93,7 @@
   </select>
 
   <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber,
+    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.phone, u.wechat,
     u.status, u.create_time
     from sys_user u
     left join sys_dept d on u.dept_id = d.dept_id
@@ -100,15 +103,15 @@
     <if test="userName != null and userName != ''">
       AND u.user_name like concat('%', #{userName}, '%')
     </if>
-    <if test="phonenumber != null and phonenumber != ''">
-      AND u.phonenumber like concat('%', #{phonenumber}, '%')
+    <if test="phone != null and phone != ''">
+      AND u.phone like concat('%', #{phone}, '%')
     </if>
     <!-- 数据范围过滤 -->
     ${params.dataScope}
   </select>
 
   <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber,
+    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.real_name, u.email, u.phone, u.wechat,
     u.status, u.create_time
     from sys_user u
     left join sys_dept d on u.dept_id = d.dept_id
@@ -120,8 +123,8 @@
     <if test="userName != null and userName != ''">
       AND u.user_name like concat('%', #{userName}, '%')
     </if>
-    <if test="phonenumber != null and phonenumber != ''">
-      AND u.phonenumber like concat('%', #{phonenumber}, '%')
+    <if test="phone != null and phone != ''">
+      AND u.phone like concat('%', #{phone}, '%')
     </if>
     <!-- 数据范围过滤 -->
     ${params.dataScope}
@@ -142,7 +145,7 @@
   </select>
 
   <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-    select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
+    select user_id, phone from sys_user where phone = #{phone} limit 1
   </select>
 
   <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
@@ -155,10 +158,13 @@
     <if test="deptId != null and deptId != 0">dept_id,</if>
     <if test="userName != null and userName != ''">user_name,</if>
     <if test="nickName != null and nickName != ''">nick_name,</if>
+    <if test="realName != null and realName != ''">real_name,</if>
     <if test="email != null and email != ''">email,</if>
     <if test="avatar != null and avatar != ''">avatar,</if>
-    <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
+    <if test="phone != null and phone != ''">phone,</if>
+    <if test="wechat != null and wechat != ''">wechat,</if>
     <if test="sex != null and sex != ''">sex,</if>
+    <if test="birthday != null">birthday,</if>
     <if test="password != null and password != ''">password,</if>
     <if test="status != null and status != ''">status,</if>
     <if test="createBy != null and createBy != ''">create_by,</if>
@@ -169,10 +175,13 @@
     <if test="deptId != null and deptId != ''">#{deptId},</if>
     <if test="userName != null and userName != ''">#{userName},</if>
     <if test="nickName != null and nickName != ''">#{nickName},</if>
+    <if test="realName != null and realName != ''">real_name,</if>
     <if test="email != null and email != ''">#{email},</if>
     <if test="avatar != null and avatar != ''">#{avatar},</if>
-    <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
+    <if test="phone != null and phone != ''">#{phone},</if>
+    <if test="wechat != null and wechat != ''">wechat,</if>
     <if test="sex != null and sex != ''">#{sex},</if>
+    <if test="birthday != null">birthday,</if>
     <if test="password != null and password != ''">#{password},</if>
     <if test="status != null and status != ''">#{status},</if>
     <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -187,9 +196,12 @@
       <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
       <if test="userName != null and userName != ''">user_name = #{userName},</if>
       <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+      <if test="realName != null and realName != ''">real_name,</if>
       <if test="email != null ">email = #{email},</if>
-      <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
+      <if test="phone != null ">phone = #{phone},</if>
+      <if test="wechat != null and wechat != ''">wechat,</if>
       <if test="sex != null and sex != ''">sex = #{sex},</if>
+      <if test="birthday != null">birthday,</if>
       <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
       <if test="password != null and password != ''">password = #{password},</if>
       <if test="status != null and status != ''">status = #{status},</if>

sql/railway.sql

@@ -46,7 +46,7 @@ create table sys_user (
   nick_name         varchar(30)     not null                   comment '用户昵称',
   user_type         varchar(2)      default '00'               comment '用户类型（00系统用户）',
   email             varchar(50)     default ''                 comment '用户邮箱',
-  phonenumber       varchar(11)     default ''                 comment '手机号码',
+  phone             varchar(11)     default ''                 comment '手机号码',
   sex               char(1)         default '0'                comment '用户性别（0男 1女 2未知）',
   avatar            varchar(100)    default ''                 comment '头像地址',
   password          varchar(100)    default ''                 comment '密码',