From e7ba7e354aace0b45f3ade179ba425ccc515591f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 20 Nov 2025 11:06:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(tenant):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=BF=BD=E7=95=A5=E7=A7=9F=E6=88=B7=E9=9A=94=E7=A6=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E4=B8=AD=E7=9A=84SQL?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正 UserMapper.xml 中 sys_user 表的数据库前缀名称
- 修正文档中对应的 SQL 查询语句表名错误
- 确保查询逻辑在忽略租户隔离时能正确执行
---
 docs/用户忽略租户隔离查询功能.md                           | 6 +++---
 .../common/system/controller/WxLoginController.java        | 7 +++++--
 .../com/gxwebsoft/common/system/mapper/xml/UserMapper.xml  | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/用户忽略租户隔离查询功能.md b/docs/用户忽略租户隔离查询功能.md
index 3107a41..917054f 100644
--- a/docs/用户忽略租户隔离查询功能.md
+++ b/docs/用户忽略租户隔离查询功能.md
@@ -76,12 +76,12 @@ public User getByIdIgnoreTenant(Integer userId) {
          c.dict_data_name sex_name,
          e.tenant_name,
          h.dealer_id
-  FROM gxgxwebsoft_core.sys_user a
+  FROM gxwebsoft_core.sys_user a
   LEFT JOIN (
     <include refid="selectSexDictSql"/>
   ) c ON a.sex = c.dict_data_code
-  LEFT JOIN gxgxwebsoft_core.sys_tenant e ON a.tenant_id = e.tenant_id
-  LEFT JOIN gxgxwebsoft_core.sys_user_referee h ON a.user_id = h.user_id and h.deleted = 0
+  LEFT JOIN gxwebsoft_core.sys_tenant e ON a.tenant_id = e.tenant_id
+  LEFT JOIN gxwebsoft_core.sys_user_referee h ON a.user_id = h.user_id and h.deleted = 0
   WHERE a.user_id = #{userId}
     AND a.deleted = 0
 </select>
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java
index 0a86841..709e492 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java
@@ -424,6 +424,7 @@ public class WxLoginController extends BaseController {
   public void getOrderQRCodeUnlimited(@PathVariable("scene") String scene, HttpServletResponse response) throws IOException {
     try {
       // 从scene参数中解析租户ID
+      System.out.println("scene = " + scene);
       Integer tenantId = extractTenantIdFromScene(scene);
       System.out.println("从scene参数中解析租户ID = " + tenantId);
       if (tenantId == null) {
@@ -641,7 +642,7 @@ public class WxLoginController extends BaseController {
     try {
       // 直接在Redis中创建配置
       String key = MP_WX_KEY + tenantId;
-      
+
       // 创建配置内容
       Map<String, String> config = new HashMap<>();
       config.put("appId", appId);
@@ -649,7 +650,7 @@ public class WxLoginController extends BaseController {
       config.put("tenantId", tenantId.toString());
       config.put("settingKey", "mp-weixin");
       config.put("settingId", "301");
-      
+
       // 保存到Redis缓存
       redisUtil.set(key, JSON.toJSONString(config));
 
@@ -722,9 +723,11 @@ public class WxLoginController extends BaseController {
       if (scene != null && scene.startsWith("uid_")) {
         String userIdStr = scene.substring(4); // 去掉"uid_"前缀
         Integer userId = Integer.parseInt(userIdStr);
+        System.out.println("userId = " + userId);
 
         // 根据用户ID查询用户信息，获取租户ID
         User user = userService.getByIdIgnoreTenant(userId);
+        System.out.println("user = " + user);
         if (user != null) {
           System.out.println("从用户ID " + userId + " 获取到租户ID: " + user.getTenantId());
           return user.getTenantId();
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index 8b01ca1..c16fae8 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -251,11 +251,11 @@
            c.dict_data_name sex_name,
            e.tenant_name,
            h.dealer_id
-    FROM gxgxwebsoft_core.sys_user a
+    FROM gxwebsoft_core.sys_user a
     LEFT JOIN (
       <include refid="selectSexDictSql"/>
     ) c ON a.sex = c.dict_data_code
-    LEFT JOIN gxgxwebsoft_core.sys_tenant e ON a.tenant_id = e.tenant_id
+    LEFT JOIN gxwebsoft_core.sys_tenant e ON a.tenant_id = e.tenant_id
     LEFT JOIN gxwebsoft_core.sys_user_referee h ON a.user_id = h.user_id and h.deleted = 0
     WHERE a.user_id = #{userId}
       AND a.deleted = 0