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<SysUserMapper, SysUser> 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<SysUserMapper, SysUser> 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();
         //编辑员工信息