Merge branch 'dev' into test

mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java

@@ -113,6 +113,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static com.mhd.common.core.utils.AESUtil.decrypt;
 import static com.mhd.common.core.utils.PageUtils.startPage;
 
 @Service
@@ -1794,14 +1795,18 @@ public class UserApplicationService {
             userDO.setUserAccountType(userPo.getUserAccountType());
             CheckDO checkDO = userFactory.getCheckDo(userDO);
             checkDO.setDataSources(userPo.getDataSources());
+            if (StringUtils.isNotEmpty(userDO.getUserPassword()) && userDO.getUserPassword().equals(userPo.getUserPassword())){
+                userDO.setUserPassword(null);
+            }
             //用户密码传值
             if (StringUtils.isNotEmpty(userDO.getUserPassword())) {
                 String userPassword = userDO.getUserPassword();
-                checkDO.setUserPassword(userPassword);
+                String decrypt = decrypt(userPassword);//解密
+                checkDO.setUserPassword(decrypt);
                 // 生成随机8位数盐
                 String salt = userPo.getUserSalt();
                 //加密算法，PBEWithMD5AndDES，
-                String passwordEncode = PasswordUtil.encrypt(userDO.getUserAccount(), userPassword, salt);
+                String passwordEncode = PasswordUtil.encrypt(userDO.getUserAccount(), decrypt, salt);
                 userDO.setUserPassword(passwordEncode);
             }
             if (ObjectUtil.isNotNull(userDO.getUserAreaCountyId()) && !"0".equals(userDO.getUserAreaCountyId())) {