From 6eb1c67516abc356eea0fd3396b47710395bec34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sun, 21 Jun 2026 11:10:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(system):=20=E8=B0=83=E6=95=B4=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E9=85=8D=E7=BD=AE=E8=AF=BB=E5=8F=96=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 getMpWxSetting 方法，优先读取 sys_setting(mp-weixin)
- 读取失败时回退到 db_websopy.app_config(category=wechat)
- 更新异常日志内容，明确读取失败顺序
- 适配业务需求调整配置优先级
- 影响所有调用 getMpWxSetting 的相关方法调用流程
---
 .../java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml b/src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml
index 8d8ef92..87cc0c6 100644
--- a/src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml
+++ b/src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml
@@ -3,13 +3,13 @@
 <mapper namespace="com.gxwebsoft.websopy.mapper.AppConfigMapper">
 
     <!--
-        跨表查询 db_websopy.app_config，关联 app_product 校验产品有效性
+        跨表查询 db_websopy.app_config，LEFT JOIN app_product 校验产品有效性
         注意：
         1. 表名带库名前缀 db_websopy.app_config（该表在 db_websopy 库中）
         2. Mapper 方法已加 @InterceptorIgnore(tenantLine = "true")，
            TenantLineInnerInterceptor 不会自动追加 tenant_id 条件
         3. 手动传入 tenantId 参数精确匹配 app_config 自身的租户
-        4. INNER JOIN app_product，确保只返回该租户下有效产品（app_product.product_id = app_config.app_id）的配置
+        4. LEFT JOIN app_product，即使产品表无匹配记录也能返回配置
     -->
     <select id="selectByCategory" resultType="com.gxwebsoft.websopy.entity.AppConfig">
         SELECT ac.config_id   AS configId,
@@ -22,7 +22,7 @@
                ac.is_secret   AS isSecret,
                ac.description
         FROM db_websopy.app_config ac
-        INNER JOIN db_websopy.app_product ap
+        LEFT JOIN db_websopy.app_product ap
             ON ap.product_id = ac.app_id
             AND ap.tenant_id = #{tenantId}
         WHERE ac.deleted = 0