From 80b0ff32ae558aaa5b92895757c5b2a3f124c290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 1 Nov 2024 05:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/config/MybatisPlusConfig.java      |  1 +
 .../gxwebsoft/common/core/web/BaseController.java  | 14 +++++++-------
 .../common/system/controller/MainController.java   |  7 ++++++-
 .../gxwebsoft/common/system/entity/Company.java    |  8 ++++++++
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
index be98acb..1c9ddaa 100644
--- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
+++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
@@ -53,6 +53,7 @@ public class MybatisPlusConfig {
         // 从请求头拿ID
         final String tenantId = request.getHeader("tenantId");
         if(tenantId != null){
+          System.out.println("从请求头拿ID = " + tenantId);
           return new LongValue(tenantId);
         }
         return getLoginUserTenantId();
diff --git a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
index a2af9d0..cccc5d1 100644
--- a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
+++ b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java
@@ -73,12 +73,7 @@ public class BaseController {
    * @return tenantId
    */
   public Integer getTenantId() {
-    // 1 从登录用户拿tenantId
-    User loginUser = getLoginUser();
-    if (loginUser != null) {
-      return loginUser.getTenantId();
-    }
-    // 2 从域名拿ID
+    // 1 从域名拿ID
     String Domain = request.getHeader("Domain");
     if (StrUtil.isNotBlank(Domain)) {
       String key = "Domain:" + Domain;
@@ -88,11 +83,16 @@ public class BaseController {
         return Integer.valueOf(tenantId);
       }
     }
-    // 3 从请求头拿ID
+    // 2 从请求头拿ID
     String tenantId = request.getHeader("tenantId");
     if(StrUtil.isNotBlank(tenantId)){
       return Integer.valueOf(tenantId);
     }
+    // 1 从登录用户拿tenantId
+    User loginUser = getLoginUser();
+    if (loginUser != null) {
+      return loginUser.getTenantId();
+    }
     return null;
   }
 
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index 03e6776..09a3daa 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -85,6 +85,8 @@ public class MainController extends BaseController {
   @Resource
   private CompanyMapper companyMapper;
   @Resource
+  private UserRoleService userRoleService;
+  @Resource
   private CompanyService companyService;
 
 
@@ -194,7 +196,7 @@ public class MainController extends BaseController {
     String key = "TenantInfo:" + tenantId;
     final String tenantInfo = redisUtil.get(key);
     if(StrUtil.isNotBlank(tenantInfo)){
-      return success(JSONObject.parseObject(tenantInfo,Company.class));
+//      return success(JSONObject.parseObject(tenantInfo,Company.class));
     }
     final Company company = companyMapper.getByTenantId(tenantId);
     // 是否过期
@@ -210,6 +212,9 @@ public class MainController extends BaseController {
     config.put("LICENSE_CODE", "dk9mcwJyetRWQlxWRiojIzJCLi8mcQ5Wa4ojI0NWZqJWd6ICZpJCL0kjNwl1NnhENahnIvl2cyVmdiwiIiATMuEjI6IibQf0NW==");
     config.put("MAP_KEY", "8191620da39a742c6f18f010c084c772");
     company.setConfig(config);
+    //应用菜单
+    company.setRoles(userRoleService.listByUserId(company.getUserId()));
+    company.setAuthorities(roleMenuService.listMenuByUserId(company.getUserId(), null));
 
     redisUtil.set(key,company,1L, TimeUnit.DAYS);
     return success(company);
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Company.java b/src/main/java/com/gxwebsoft/common/system/entity/Company.java
index df1bbd5..23fd9cb 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Company.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Company.java
@@ -313,6 +313,14 @@ public class Company implements Serializable {
     @TableField(exist = false)
     private Integer num;
 
+    @ApiModelProperty("角色列表")
+    @TableField(exist = false)
+    private List<Role> roles;
+
+    @ApiModelProperty("权限列表")
+    @TableField(exist = false)
+    private List<Menu> authorities;
+
     public String getMobile() {
       return DesensitizedUtil.mobilePhone(this.phone);
     }