update user role

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

@@ -284,13 +284,12 @@ public class UserServiceImpl implements UserService {
         }
 
         Long roleId = userModelVo.getRoleId();
-        Role role = null;
         if (roleId != null) {
             if (!roleRepository.exists(roleId)) {
                 log.error("{},不存在对应的角色 roleId={}", LOG_PRE, roleId);
                 return Result.buildFail("不存在对应的角色");
             }
-            role = roleRepository.getOne(roleId);
+            Role role = roleRepository.getOne(roleId);
             if (roleId == 1L) {
                 // 将普通用户设置成超级管理，需要级联设置用户级别
                 exist.setRank(UserRank.SUPER_ADMINISTRATOR);
@@ -300,6 +299,7 @@ public class UserServiceImpl implements UserService {
                     exist.setRank(UserRank.OPERATOR);
                 }
             }
+            exist.setRoles(Collections.singletonList(role));
         }
 
         Long channelId = exist.getChannelId();
@@ -314,7 +314,6 @@ public class UserServiceImpl implements UserService {
             exist.setChannelName(configuration.getChannelName());
         }
 
-        exist.setRoles(Collections.singletonList(role));
         exist.setUpdateTime(new Date());
         userRepository.save(exist);
         return Result.buildSuccess(true);