更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/LoginPlatformTokenModel.java

@@ -3,6 +3,8 @@ package com.zhongshu.card.client.model.org;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.Set;
+
 /**
  * @author TRX
  * @date 2024/6/17
@@ -11,11 +13,20 @@ import lombok.Data;
 public class LoginPlatformTokenModel {
     @Schema(description = "token")
     private String access_token;
+
     private String token_type;
+
     @Schema(description = "刷新token的token")
     private String refresh_token;
+
     private Integer expires_in;
+
     private String scope;
+
     private String platformOid;
+
     OrganizationUserModel userInfo;
+
+    @Schema(description = "用户权限列表")
+    private Set<String> auths;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/RoleController.java

@@ -96,7 +96,7 @@ public class RoleController {
         return roleService.editRoleAuth(param);
     }
 
-    @Operation(summary = "获取用户在当前结机构权限列表", description = "获取用户在当前结机构权限列表")
+    @Operation(summary = "获取用户在当前结机构权限列表 （登录后加载）", description = "获取用户在当前结机构权限列表")
     @RequestMapping(value = "getOrganizationAuth", method = {RequestMethod.GET})
     @ResourceAuth(value = "user", type = AuthType.User)
     public Object getOrganizationAuth(

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/IndexService.java

@@ -89,6 +89,8 @@ public class IndexService {
 
     @Autowired
     UserAccountServiceImpl userAccountService;
+    @Autowired
+    private RoleServiceImpl roleServiceImpl;
 
     /**
      * 登录 只验证 用户名 和密码
@@ -182,9 +184,15 @@ public class IndexService {
         LoginPlatformTokenModel tokenModel = new LoginPlatformTokenModel();
         com.zhongshu.card.server.core.util.BeanUtils.copyProperties(loginTokenModel, tokenModel);
         tokenModel.setPlatformOid(organization.getOid());
+
+        // 查询用户信息
         OrganizationUserModel userModel = userAccountService.toOrgUserModel(organizationUser);
         tokenModel.setUserInfo(userModel);
 
+        ResultContent<Set<String>> authContent = roleServiceImpl.getOrganizationAuth(organization.getOid());
+        if (authContent.isSuccess()) {
+            tokenModel.setAuths(authContent.getContent());
+        }
         return ResultContent.buildSuccess(tokenModel);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/RoleServiceImpl.java

@@ -372,12 +372,16 @@ public class RoleServiceImpl extends SuperService {
      * @param oid
      * @return
      */
-    public ResultContent getOrganizationAuth(String oid) {
+    public ResultContent<Set<String>> getOrganizationAuth(String oid) {
         if (StringUtils.isEmpty(oid)) {
             oid = getCurrentOid();
         }
         String userId = getCurrentUserId();
         Set<String> auth = new HashSet<>();
+        if (StringUtils.isEmpty(oid)) {
+            return ResultContent.buildSuccess(auth);
+        }
+
         var roleGroupModels = roleService.listRoleGroupFromOrganizationUser(oid, userId).getContent();
         if (!CollectionUtils.isEmpty(roleGroupModels)) {
             roleGroupModels.stream().forEach(roleGroup -> {