فهرست منبع

用户添加英文名

yzc 1 سال پیش
والد
کامیت
5ffbec98f2

+ 1 - 0
hx-base/src/main/java/com/fjhx/base/system/SysProfileController.java

@@ -70,6 +70,7 @@ public class SysProfileController extends BaseController {
         if (userService.updateUserProfile(user) > 0) {
             // 更新缓存用户信息
             sysUser.setNickName(user.getNickName());
+            sysUser.setNickNameEn(user.getNickNameEn());
             sysUser.setPhonenumber(user.getPhonenumber());
             sysUser.setEmail(user.getEmail());
             sysUser.setSex(user.getSex());

+ 15 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -50,6 +50,11 @@ public class SysUser extends BaseEntity {
     private String nickName;
 
     /**
+     * 用户英文名
+     */
+    private String nickNameEn;
+
+    /**
      * 用户类型 1系统用户 0非系统用户
      */
     private Integer userType;
@@ -210,6 +215,16 @@ public class SysUser extends BaseEntity {
         this.nickName = nickName;
     }
 
+    @Xss(message = "用户英文名不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户英文名长度不能超过30个字符")
+    public String getNickNameEn() {
+        return nickNameEn;
+    }
+
+    public void setNickNameEn(String nickNameEn) {
+        this.nickNameEn = nickNameEn;
+    }
+
     @Xss(message = "用户账号不能包含脚本字符")
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 2, max = 30, message = "用户账号长度不能少于2个字符,不能超过30个字符")

+ 8 - 3
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="deptId" column="dept_id"/>
 		<result property="userName" column="user_name"/>
 		<result property="nickName" column="nick_name"/>
+		<result property="nickNameEn" column="nick_name_en"/>
 		<result property="email" column="email"/>
 		<result property="phonenumber" column="phonenumber"/>
 		<result property="sex" column="sex"/>
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.dept_id,
 			   u.user_name,
 			   u.nick_name,
+			   u.nick_name_en,
 			   u.email,
 			   u.avatar,
 			   u.phonenumber,
@@ -298,7 +300,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userType != null and userType != ''">user_type,</if>
         <if test="jobNumber != null and jobNumber != ''">job_number,</if>
         <if test="userCode != null and userCode != ''">user_code,</if>
-        create_time
+		<if test="nickNameEn != null and nickNameEn != ''">nick_name_en,</if>
+		create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
@@ -316,7 +319,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userType != null and userType != ''">#{userType},</if>
         <if test="jobNumber != null and jobNumber != ''">#{jobNumber},</if>
         <if test="userCode != null and userCode != ''">#{userCode},</if>
-        sysdate()
+		<if test="nickNameEn != null and nickNameEn != ''">#{nickNameEn},</if>
+		sysdate()
         )
     </insert>
 
@@ -340,7 +344,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userType != null and userType != ''">user_type = #{userType},</if>
             <if test="jobNumber != null and jobNumber != ''">job_number = #{jobNumber},</if>
 			<if test="userCode != null and userCode != ''">user_code = #{userCode},</if>
-            update_time = sysdate()
+			<if test="nickNameEn != null and nickNameEn != ''">nick_name_en = #{nickNameEn},</if>
+			update_time = sysdate()
         </set>
         where user_id = #{userId}
     </update>