From 76fb5d8b5249d74a77ca3e44ca9cf98b57b31ace Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期五, 30 五月 2025 14:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
index eac2ee3..a858e13 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
@@ -172,7 +172,10 @@
             <if test="orgid != null">orgid = #{orgid},
             </if>
         </trim>
-        where id = #{id}
+        <where>
+        <if test="id != null">and id = #{id}</if>
+        <if test="taskId != null">and task_id = #{taskId}</if>
+        </where>
     </update>
 
     <update id="deleteServiceTaskdeptById" parameterType="Long">
@@ -183,6 +186,17 @@
         </trim>
         where id = #{id}
     </update>
+    <update id="deleteServiceTaskdeptByTaskId" parameterType="com.smartor.domain.ServiceTaskdept">
+        update service_taskdept
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1,
+            update_time = sysdate()
+        </trim>
+        <where>
+            <if test="id != null">and id = #{id}</if>
+            <if test="taskId != null">and task_id = #{taskId}</if>
+        </where>
+    </update>
 
     <update id="deleteServiceTaskdeptByIds" parameterType="String">
         update service_taskdept

--
Gitblit v1.9.3