From efe7904755d1509898ab6568ad18fb8e4974686b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 9 Feb 2026 10:08:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(database):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5=E6=9D=A1=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为父级导航连接添加删除状态和租户ID过滤条件
- 移除模型连接中不必要的 c.model = 0 条件以避免字符串转数字比较
- 为模型连接添加删除状态和租户ID过滤条件
- 添加注释说明原条件导致的性能问题
---
 .../com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml
index 93a4ae3..f887e07 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml
@@ -6,8 +6,9 @@
     <sql id="selectSql">
         SELECT a.*, b.title as parentName, b.position as parentPosition, c.name as modelName
         FROM cms_navigation a
-        LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id
-        LEFT JOIN cms_model c ON a.model = c.model AND c.model = 0
+        LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id AND b.deleted = 0 AND b.tenant_id = a.tenant_id
+        <!-- c.model = 0 会触发 MySQL 字符串转数字比较，导致几乎所有模型都匹配，从而把导航行成倍放大 -->
+        LEFT JOIN cms_model c ON a.model = c.model AND c.deleted = 0 AND c.tenant_id = a.tenant_id
         <where>
             <if test="param.navigationId != null">
                 AND a.navigation_id = #{param.navigationId}