diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index b0f563e..5a55c30 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -34,21 +34,33 @@ public class SysUser extends BaseEntity /** 用户ID */ private Long userId; + /** 登录名称 */ + @Excel(name = "登录账号") + private String loginName; + /** 用户名称 */ @Excel(name = "人员姓名") private String userName; - /** 登录名称 */ - @Excel(name = "登录账号") - private String loginName; + /** 用户性别 */ + @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") + private String sex; @Excel(name = "身份证号") private String cerno; + /** 用户地区 */ + @Excel(name = "籍贯") + private String userarea; + /** 部门ID */ @Excel(name = "部门编号", type = Type.IMPORT) private Long deptId; + /** 涉密程度 */ + @Excel(name = "涉密程度",readConverterExp = "0=一般涉密人员,1=重要涉密人员,2=核心涉密人员") + private String shemichengdu; + /** 部门父ID */ @TableField(exist=false) private Long parentId; @@ -61,16 +73,13 @@ public class SysUser extends BaseEntity private String userType; /** 用户邮箱 */ - @Excel(name = "用户邮箱") + @Excel(name = "用户邮箱",type = Type.EXPORT) private String email; /** 手机号码 */ @Excel(name = "手机号码") private String phonenumber; - /** 用户性别 */ - @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") - private String sex; /** 用户头像 */ private String avatar; @@ -96,9 +105,7 @@ public class SysUser extends BaseEntity /** 密码最后更新时间 */ private Date pwdUpdateDate; - /** 用户地区 */ - @Excel(name = "用户地区") - private String userarea; + /** 民族 */ @Excel(name = "民族",readConverterExp = "4=汉族,5=苗族,6=维吾尔族") @@ -185,12 +192,9 @@ public class SysUser extends BaseEntity @Excel(name = "政治面貌",readConverterExp = "1=党员,2=团员,3=群众") private String politics; - /** 涉密程度 */ - @Excel(name = "涉密程度",readConverterExp = "0=一般涉密人员,1=重要涉密人员,2=核心涉密人员") - private String shemichengdu; /** 学历 */ - @Excel(name = "学历") + @Excel(name = "学历",type = Type.EXPORT) private String graduate; diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 2eddd59..399cbb3 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,have_passport,conf_agreement,entryexit_filing,conf_name, + select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex,u.cerno, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_time, u.remark,userarea, nation, birthday, politics, shemichengdu, graduate, startdate, enddate, helthy,examine,examineuser,examinedate,have_passport,conf_agreement,entryexit_filing,conf_name, d.dept_id, d.parent_id, d.ancestors, 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 ${prefix}sys_user u