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 ( ) 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 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 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 ( ) 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