机构类型

src/main/java/com/zswl/dataservice/service/user/impl/UserManagerServiceImpl.java

@@ -81,17 +81,10 @@ public class UserManagerServiceImpl extends SuperService {
         if (!b) {
             return ResultContent.buildFail("电话号码格式不正确");
         }
-        if (!param.getNewPassWord().equals(param.getConfirmPass())) {
-            return ResultContent.buildFail("密码和验证密码不一致");
-        }
-        ValidateResult validateResult = ValidateUtils.validatePassWord(param.getNewPassWord());
-        if (!validateResult.isSuccess()) {
-            return ResultContent.buildFail(validateResult.getMsg());
-        }
-
         User user = null;
         User temp = userDao.findByLoginName(loginName);
         if (StringUtils.isNotEmpty(param.getId())) {
+            // 编辑
             user = userDao.findTopById(param.getId());
             if (ObjectUtils.isEmpty(user)) {
                 return ResultContent.buildFail(String.format("用户ID不存在：%s", param.getId()));
@@ -99,8 +92,17 @@ public class UserManagerServiceImpl extends SuperService {
             if (ObjectUtils.isNotEmpty(temp) && !temp.getId().equals(user.getId())) {
                 return ResultContent.buildFail(String.format("该账号已存在：%s", loginName));
             }
-            BeanUtils.copyProperties(param, user);
+            BeanUtils.copyProperties(param, user, "passWord", "loginName");
         } else {
+            // 添加
+            if (!param.getNewPassWord().equals(param.getConfirmPass())) {
+                return ResultContent.buildFail("密码和验证密码不一致");
+            }
+            ValidateResult validateResult = ValidateUtils.validatePassWord(param.getNewPassWord());
+            if (!validateResult.isSuccess()) {
+                return ResultContent.buildFail(validateResult.getMsg());
+            }
+
             if (ObjectUtils.isNotEmpty(temp)) {
                 return ResultContent.buildFail(String.format("该账号已存在：%s", loginName));
             }