From af2ab01e596c53182db8d936077a3de223aebeda Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Tue, 18 May 2021 11:15:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AF=86=E7=A0=81=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E5=8A=A0=E5=AF=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaonuo/sys/modular/user/factory/SysUserFactory.java | 2 -- .../sys/modular/user/service/impl/SysUserServiceImpl.java | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java index 17ee6f0a..207fad15 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java @@ -65,8 +65,6 @@ public class SysUserFactory { String password = ConstantContextHolder.getDefaultPassWord(); //设置密码为Md5加密后的密码 sysUser.setPassword(BCrypt.hashpw(password, BCrypt.gensalt())); - } else { - sysUser.setPassword(BCrypt.hashpw(sysUser.getPassword(), BCrypt.gensalt())); } if (ObjectUtil.isEmpty(sysUser.getAvatar())) { diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index efaa9357..a9f94981 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -188,6 +188,9 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser sysUser = new SysUser(); BeanUtil.copyProperties(sysUserParam, sysUser); SysUserFactory.fillAddCommonUserInfo(sysUser); + if(ObjectUtil.isNotEmpty(sysUserParam.getPassword())) { + sysUser.setPassword(BCrypt.hashpw(sysUserParam.getPassword(), BCrypt.gensalt())); + } this.save(sysUser); Long sysUserId = sysUser.getId(); //增加员工信息 @@ -257,6 +260,9 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setStatus(null); //设置密码 SysUserFactory.fillBaseUserInfo(sysUser); + if(ObjectUtil.isNotEmpty(sysUserParam.getPassword())) { + sysUser.setPassword(BCrypt.hashpw(sysUserParam.getPassword(), BCrypt.gensalt())); + } this.updateById(sysUser); Long sysUserId = sysUser.getId(); //编辑员工信息