Merge remote-tracking branch 'origin/master'

liusheng

2025-04-25 5fe107b01e611e03034efbb76b97c3faae539f6b

 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