修改用户信息

src/main/java/cn/quantgroup/cashloanflowboss/api/user/service/UserServiceImpl.java

@@ -269,7 +269,13 @@ public class UserServiceImpl implements UserService {
             return Result.buildFail("不存在相应的用户，不能更新");
         }
         User exist = userRepository.getOne(id);
-        String password = exist.getPassword();
+        // 修改密码是单独的接口
+        if (StringUtils.isNotEmpty(userModelVo.getPassword())) {
+            exist.setPassword(userModelVo.getPassword());
+        }
+        if (StringUtils.isNotEmpty(userModelVo.getNickname())) {
+            exist.setNickname(userModelVo.getNickname());
+        }
         String existUsername = exist.getUsername();
         String username = userModelVo.getUsername();
         if (!existUsername.equals(username)) {
@@ -285,32 +291,29 @@ public class UserServiceImpl implements UserService {
                 return Result.buildFail("不存在对应的角色");
             }
             role = roleRepository.getOne(roleId);
+            if (roleId == 1L) {
+                // 将普通用户设置成超级管理，需要级联设置用户级别
+                exist.setRank(UserRank.SUPER_ADMINISTRATOR);
+            } else {
+                if (exist.getRank().equals(UserRank.SUPER_ADMINISTRATOR)) {
+                    // 如果之前是超管 改成普通操作员，用户级别做相应调整
+                    exist.setRank(UserRank.OPERATOR);
+                }
+            }
         }
 
-
-        BeanUtils.copyProperties(userModelVo, exist);
-        exist.setPassword(password);
         Long channelId = exist.getChannelId();
-
-        //渠道检查
+        // 渠道id检查
         if (channelId != null) {
             ClfChannelConfiguration configuration = clfChannelConfigurationRepository.findByRegisteredFrom(channelId);
             if (configuration == null) {
                 log.error("{}，渠道不存在 channelId={}", LOG_PRE, channelId);
                 return Result.buildFail("channelId=" + channelId + "的渠道不存在");
             }
+            exist.setChannelId(channelId);
             exist.setChannelName(configuration.getChannelName());
         }
-        if (roleId == 1L) {
-            // 将普通用户设置成超级管理，需要级联设置用户级别
-            exist.setRank(UserRank.SUPER_ADMINISTRATOR);
-        } else {
-            if (exist.getRank().equals(UserRank.SUPER_ADMINISTRATOR)) {
-                // 如果之前是超管 改成普通操作员，用户级别做相应调整
-                exist.setRank(UserRank.OPERATOR);
-            }
-        }
-        //exist.setPassword(MD5Tools.md5(userModelVo.getPassword()));
+
         exist.setRoles(Collections.singletonList(role));
         exist.setUpdateTime(new Date());
         userRepository.save(exist);