From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
index 6892c29..00fb720 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
@@ -44,8 +44,8 @@
     <select id="selectServiceTaskdiagList" parameterType="com.smartor.domain.ServiceTaskdiag"
             resultMap="ServiceTaskdiagResult">
         <include refid="selectServiceTaskdiagVo"/>
-        <where>
-            del_flag=0
+        where 1=1
+            and del_flag = 0
             <if test="taskId != null ">
                 and task_id = #{taskId}
             </if>
@@ -79,7 +79,6 @@
             <if test="pid != null ">
                 and pid = #{pid}
             </if>
-        </where>
     </select>
 
     <select id="selectServiceTaskdiagById" parameterType="Long"

--
Gitblit v1.9.3