From 307c20956581dac9bbb628989a02251974051c50 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, 18 Jun 2026 17:17:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(appconfig):=20=E4=BF=AE=E5=A4=8D=E8=B7=A8?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BB=A5=E7=A1=AE=E4=BF=9D=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=9C=89=E6=95=88=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- selectByCategory SQL 增加 INNER JOIN app_product，确保只返回该租户下有效产品配置
- 加入关联条件 ap.product_id = ac.app_id 和 ap.tenant_id = #{tenantId}
- 保证查询结果中 app_config 的 app_id 必须对应有效且属于当前租户的产品
- 维护原有租户过滤和配置类型过滤逻辑，增强数据准确性
- 该改动对 Service 和 Controller 层无影响，无需修改调用逻辑
---
 .workbuddy/memory/2026-06-18.md               | 11 +++++++
 .../websopy/mapper/AppConfigMapper.xml        | 32 +++++++++++--------
 2 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 .workbuddy/memory/2026-06-18.md

diff --git a/.workbuddy/memory/2026-06-18.md b/.workbuddy/memory/2026-06-18.md
new file mode 100644
index 0000000..28da208
--- /dev/null
+++ b/.workbuddy/memory/2026-06-18.md
@@ -0,0 +1,11 @@
+# 2026-06-18 工作日志
+
+## AppConfigMapper.xml 添加关联查询
+
+**改动文件**: `src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml`
+
+- `selectByCategory` SQL 增加了 `INNER JOIN db_websopy.app_product`，关联条件：
+  - `ap.product_id = ac.app_id`
+  - `ap.tenant_id = #{tenantId}`
+- 目的：确保只返回该租户下有效产品的配置，防止 app_config 中的 app_id 指向非该租户的产品
+- Service 层和 Controller 层无需改动，不影响现有调用
diff --git a/src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml b/src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml
index 7ded385..8d8ef92 100644
--- a/src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml
+++ b/src/main/java/com/gxwebsoft/websopy/mapper/AppConfigMapper.xml
@@ -3,27 +3,31 @@
 <mapper namespace="com.gxwebsoft.websopy.mapper.AppConfigMapper">
 
     <!--
-        跨表查询 db_websopy.app_config
+        跨表查询 db_websopy.app_config，关联 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）的配置
     -->
     <select id="selectByCategory" resultType="com.gxwebsoft.websopy.entity.AppConfig">
-        SELECT config_id   AS configId,
-               app_id      AS appId,
-               tenant_id   AS tenantId,
-               config_key  AS configKey,
-               config_value AS configValue,
-               config_type AS configType,
-               is_encrypted AS isEncrypted,
-               is_secret   AS isSecret,
-               description
-        FROM db_websopy.app_config
-        WHERE deleted = 0
-          AND tenant_id  = #{tenantId}
-          AND config_type = #{configType}
+        SELECT ac.config_id   AS configId,
+               ac.app_id      AS appId,
+               ac.tenant_id   AS tenantId,
+               ac.config_key  AS configKey,
+               ac.config_value AS configValue,
+               ac.config_type AS configType,
+               ac.is_encrypted AS isEncrypted,
+               ac.is_secret   AS isSecret,
+               ac.description
+        FROM db_websopy.app_config ac
+        INNER JOIN db_websopy.app_product ap
+            ON ap.product_id = ac.app_id
+            AND ap.tenant_id = #{tenantId}
+        WHERE ac.deleted = 0
+          AND ac.tenant_id  = #{tenantId}
+          AND ac.config_type = #{configType}
     </select>
 
 </mapper>