后台修改密码问题

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -672,12 +672,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = sysUserVo.getSysUser();
 
         //修改用户不能修改密码
-        if (StringUtils.isNotEmpty(sysUser.getPassword())) {
-            String salt = PasswordUtils.getSalt();
-            String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
-            sysUser.setPassword(pwd);
-            sysUser.setSalt(salt);
-        } else {
+        if (StringUtils.isEmpty(sysUser.getPassword())) {
             return HttpResult.error("密码不能为空");
         }
 
@@ -690,8 +685,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return HttpResult.error("状态不能为空");
         }
         SysUser sysUser_org = findByUserId(sysUser.getId());
-        sysUser.setPassword(sysUser_org.getPassword());
-        sysUser.setSalt(sysUser_org.getSalt());
+
+        // 修改密码数据库相同不做修改
+        if (!sysUser_org.getPassword().equals(sysUser.getPassword())) {
+            String salt = PasswordUtils.getSalt();
+            String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
+            sysUser.setPassword(pwd);
+            sysUser.setSalt(salt);
+        }else {
+            sysUser.setPassword(sysUser_org.getPassword());
+            sysUser.setSalt(sysUser_org.getSalt());
+        }
+
         if ("19".equals(sysUser.getRoleId())) {//19 出单员 校验机构和业务员机构是否一致
             return checkChuDanUser(sysUser);
         }