From 8aa8d7f739fb4a998257d802f92275bca6bfb0f0 Mon Sep 17 00:00:00 2001
From: yinhuaiwei <yinhuaiwei@ht-atia.com>
Date: Mon, 2 Feb 2026 11:51:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A1=E8=A7=86=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=94=AF=E6=8C=81=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=92=8C=E5=8C=BA=E5=9F=9F=E5=90=8D=E7=A7=B0=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/task/PatrolTaskStatusMapper.xml    | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
index c4aa764..29fadb7 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
@@ -84,22 +84,12 @@
         <where>
             <if test="taskPatrolledId != null  and taskPatrolledId != ''">and a.task_patrolled_id = #{taskPatrolledId}
             </if>
-            <choose>
-                <!-- 当taskName和areaTaskName都有值时 -->
-                <when test="taskName != null and taskName != '' and areaTaskName != null and areaTaskName != ''">
-                    and (a.task_name like concat('%', #{taskName}, '%')
-                    or a.task_name like concat('%', #{areaTaskName}, '%'))
-                </when>
-                <otherwise>
-                    <!-- 只有一个参数有值时 -->
-                    <if test="taskName != null and taskName != ''">
-                        and a.task_name like concat('%', #{taskName}, '%')
-                    </if>
-                    <if test="areaTaskName != null and areaTaskName != ''">
-                        and a.task_name like concat('%', #{areaTaskName}, '%')
-                    </if>
-                </otherwise>
-            </choose>
+            <if test="taskName != null and taskName != ''">
+                and a.task_name like concat('%', #{taskName}, '%')
+            </if>
+            <if test="areaTaskName != null and areaTaskName != ''">
+                and a.area_name like concat('%', #{areaTaskName}, '%')
+            </if>
             <if test="taskCode != null  and taskCode != ''">and a.task_code = #{taskCode}</if>
             <if test="taskState != null  and taskState != ''">and a.task_state = #{taskState}</if>
             <if test="planStartTime != null ">and a.plan_start_time = #{planStartTime}</if>