新增 修改用户是 角色只能有一个role

src/main/java/cn/quantgroup/cashloanflowboss/api/login/service/LoginServiceImpl.java

@@ -19,7 +19,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.Date;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Created by WeiWei on 2019/7/22.
@@ -82,7 +81,7 @@ public class LoginServiceImpl implements LoginService {
         principal.setUserInfo(userInfo);
         principal.setChannelId(user.getChannelId());
         principal.setRank(user.getRank());
-        principal.setRoles(user.getRoles());
+        principal.setRoles(user.getRole());
         long currentTimeMillis = System.currentTimeMillis();
         principal.setLoginTimeMillis(currentTimeMillis);
 

src/main/java/cn/quantgroup/cashloanflowboss/api/user/entity/User.java

@@ -13,7 +13,6 @@ import org.springframework.beans.BeanUtils;
 import javax.persistence.*;
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 
 /**
  * Created by WeiWei on 2019/7/22.
@@ -63,7 +62,7 @@ public class User extends Primary {
      */
     @OneToMany(fetch = FetchType.EAGER)
     @JoinTable(name = "user_role_mapping", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
-    private List<Role> roles;
+    private Role role;
 
     /**
      * 用户状态
@@ -87,7 +86,7 @@ public class User extends Primary {
         BeanUtils.copyProperties(userModelVo, user);
         user.setPassword(MD5Tools.md5(userModelVo.getPassword()));
         if (role != null) {
-            user.setRoles(Collections.singletonList(role));
+            user.setRole(role);
 
         }
         return user;

src/main/java/cn/quantgroup/cashloanflowboss/api/user/model/UserInfoModel.java

@@ -53,7 +53,7 @@ public class UserInfoModel {
     /**
      * 用户角色列表
      */
-    private List<Role> roles;
+    private Role roles;
 
     /**
      * 用户状态

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

@@ -200,7 +200,7 @@ public class UserServiceImpl implements UserService {
         } else {
             user1.setPassword(MD5Tools.md5(userInfoModel.getPassword()));
         }
-        user1.setRoles(userInfoModel.getRoles());
+        user1.setRole(userInfoModel.getRoles());
         return userRepository.save(user1);
     }
 
@@ -291,9 +291,8 @@ public class UserServiceImpl implements UserService {
                 return Result.buildFail("不存在对应的角色");
             }
             Role role = roleRepository.getOne(roleId);
-            List<Long> idList = exist.getRoles().stream().map(Role::getId).collect(Collectors.toList());
-            if (!idList.contains(roleId)) {
-                exist.getRoles().add(role);
+            if (!exist.getRole().getId().equals(roleId)) {
+                exist.setRole(role);
             }
             if (roleId == 1L) {
                 // 将普通用户设置成超级管理，需要级联设置用户级别