From e7e31eff6da68b756fc78661c55276b591eb80f2 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Thu, 11 Jun 2026 17:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A1=E5=88=92=E9=80=9A=E7=9F=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnforcementInspectionProgramMapper.xml    | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml
index fab64e3e..62039d55 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml
@@ -161,15 +161,33 @@
             order by create_time desc
         </select>
 
-        <!-- 分页查询计划列表（包含权限控制） -->
+        <!-- 分页查询计划列表(包含权限控制) - 优化版本 -->
         <select id="selectPlanPage" resultType="com.zdxt.enforcementcode.domain.vo.EnforcementInspectionProgramVo">
             <include refid="selectEnforcementInspectionProgramVo"/>
-            where (is_publish = 1 or enforcement_department_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{bo.deptId} or find_in_set( #{bo.deptId} , ancestors ) != 0 ))
-            <if test="bo.searchText != null and bo.searchText != ''">
-                and (plan_name like concat('%', #{bo.searchText}, '%')
-                or enforcement_department like concat('%', #{bo.searchText}, '%')
-                or bureau_dept_name like concat('%', #{bo.searchText}, '%'))
-            </if>
-            order by create_time desc
+            <where>
+                <!-- 使用 UNION 替代 OR，提升查询性能 -->
+                id IN (
+                    <!-- 已发布的计划 -->
+                    SELECT id FROM enforcement_inspection_program WHERE is_publish = 1
+
+                    UNION
+
+                    <!-- 本部门及下级部门的计划 -->
+                    SELECT id FROM enforcement_inspection_program
+                    WHERE enforcement_department_id IN (
+                        SELECT dept_id FROM sys_dept
+                        WHERE dept_id = #{bo.deptId}
+                           OR FIND_IN_SET(#{bo.deptId}, ancestors) != 0
+                    )
+                )
+
+                <!-- 搜索条件 -->
+                <if test="bo.searchText != null and bo.searchText != ''">
+                    AND (plan_name LIKE CONCAT('%', #{bo.searchText}, '%')
+                    OR enforcement_department LIKE CONCAT('%', #{bo.searchText}, '%')
+                    OR bureau_dept_name LIKE CONCAT('%', #{bo.searchText}, '%'))
+                </if>
+            </where>
+            ORDER BY create_time DESC
         </select>
 </mapper>