用户信息新增机构权限

auth-service/src/main/java/com/hungraim/ltc/gateway/config/AuthorizationServerConfiguration.java

@@ -160,6 +160,8 @@ public class AuthorizationServerConfiguration extends AuthorizationServerConfigu
             map.put("avatar", user.getAvatar());
             map.put("userId", user.getUserId());
             map.put("account", user.getUsername());
+            map.put("organId", user.getOrganId());
+            map.put("srvOrganId", user.getSrvOrganId());
             ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(map);
             return accessToken;
         };

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemUser.java

@@ -27,5 +27,7 @@ public class SystemUser {
     private Integer userStatus;
     private Date createdTime;
     private Date updatedTime;
+    private Long organId;
+    private Long srvOrganId;
 
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/system/ReqUserInfo.java

@@ -20,5 +20,7 @@ public class ReqUserInfo {
     private String marketerCode;
     private List<Long> roleIds;
 
+    private Long organId;
+    private Long srvOrganId;
 
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/system/UserLoginInfoVO.java

@@ -23,6 +23,8 @@ public class UserLoginInfoVO implements UserDetails {
     private final Long userId;
     private String avatar;
     private final Boolean enable;
+    private Long organId;
+    private Long srvOrganId;
 
     public UserLoginInfoVO(SystemUser user) {
         this.username = user.getAccount();
@@ -30,6 +32,8 @@ public class UserLoginInfoVO implements UserDetails {
         this.name = user.getRealName();
         this.userId = user.getUserId();
         this.enable = user.getUserStatus() == 1;
+        this.organId = user.getOrganId();
+        this.srvOrganId = user.getSrvOrganId();
     }
 
     public void setAuthorities(List<Long> roles) {

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -110,6 +110,8 @@ public class UserController {
         user.setRealName(reqUserInfo.getName());
         user.setUserStatus(reqUserInfo.getEnable());
         user.setCreatedTime(new Date());
+        user.setOrganId(reqUserInfo.getOrganId());
+        user.setSrvOrganId(reqUserInfo.getSrvOrganId());
         userInfoService.save(user);
         Long userId = user.getUserId();
         //初始化权限
@@ -192,6 +194,8 @@ public class UserController {
             userInfo.setEnable(user.getUserStatus());
             userInfo.setAvatar(user.getAvatar());
             userInfo.setGender(Gender.MAN.getCode().equals(user.getGender()) ? Gender.MAN.getDesc() : Gender.WOMAN.getDesc());
+            userInfo.setOrganId(user.getOrganId());
+            userInfo.setSrvOrganId(user.getSrvOrganId());
             return userInfo;
         }).collect(Collectors.toList());
         return Result.success(resUsers);