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 763aab5..c02aa5e 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 @@ -27,7 +27,6 @@ public class SysUser extends BaseEntity private Long userId; /** 部门ID */ - @Excel(name = "部门编号", type = Type.IMPORT) private Long deptId; /** 部门父ID */ @@ -48,7 +47,6 @@ public class SysUser extends BaseEntity private String userType; /** 用户邮箱 */ - @Excel(name = "用户邮箱") private String email; /** 手机号码 */ @@ -89,7 +87,6 @@ public class SysUser extends BaseEntity /** 部门对象 */ @Excels({ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), - @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) }) private SysDept dept; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 6f39295..03c87e4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -499,7 +499,8 @@ public class SysUserServiceImpl implements ISysUserService if (StringUtils.isNull(u)) { BeanValidators.validateWithException(validator, user); - user.setPassword(Md5Utils.hash(user.getLoginName() + password)); + user.setSalt(ShiroUtils.randomSalt()); + user.setPassword(Md5Utils.hash(user.getLoginName() + password + user.getSalt())); user.setCreateBy(operName); userMapper.insertUser(user); successNum++;