From f881ec0d1fbe6e56302c9f344efd50008dc338d1 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 27 Nov 2025 16:23:34 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=92=8C=E5=B7=A5=E5=8D=95=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=AF=B9processtask=5Fstep=5Fin=5Fo?=
 =?UTF-8?q?peration=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1563833548636166]步骤完成和工单完成时增加对processtask_step_in_operation删除操作 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1563833548636166
---
 .../api/processtask/ProcessTaskCreateApi.java |  2 ++
 .../mapper/processtask/ProcessTaskMapper.xml  | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java
index 52e67bc6a..3e3efd439 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCreateApi.java
@@ -3,6 +3,7 @@ package neatlogic.module.process.api.processtask;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
+import neatlogic.framework.common.constvalue.systemuser.SystemUser;
 import neatlogic.framework.process.auth.PROCESS_BASE;
 import neatlogic.framework.process.dto.ProcessTaskCreateVo;
 import neatlogic.framework.restful.annotation.*;
@@ -17,6 +18,7 @@ import java.util.Objects;
 
 @AuthAction(action = PROCESS_BASE.class)
 @Service
+@AuthUser(SystemUser.SYSTEM)
 @OperationType(type = OperationTypeEnum.UPDATE)
 public class ProcessTaskCreateApi extends PrivateApiComponentBase {
 
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
index ed80829a5..b374c7b5e 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
+++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskMapper.xml
@@ -3642,19 +3642,22 @@
 
     <insert id="insertProcessTaskStepInOperation"
             parameterType="neatlogic.framework.process.dto.ProcessTaskStepInOperationVo">
-        <selectKey keyProperty="id" resultType="java.lang.Long" order="AFTER">
-            select LAST_INSERT_ID() as id
-        </selectKey>
-        INSERT IGNORE INTO `processtask_step_in_operation` (`processtask_id`,
+        INSERT IGNORE INTO `processtask_step_in_operation` (
+        `id`,
+        `processtask_id`,
         `processtask_step_id`,
         `operation_type`,
         `operation_time`,
-        `expire_time`)
-        VALUES (#{processTaskId},
+        `expire_time`,
+        `server_id`)
+        VALUES (
+        #{id},
+        #{processTaskId},
         #{processTaskStepId},
         #{operationType},
         NOW(3),
-        #{expireTime})
+        #{expireTime},
+        #{serverId})
     </insert>
 
     <insert id="insertProcessTaskStepTag" parameterType="neatlogic.framework.process.dto.ProcessTaskStepTagVo">
@@ -4130,7 +4133,9 @@
         FROM `processtask_step_in_operation`
         WHERE `processtask_id` = #{processTaskId}
         AND `processtask_step_id` = #{processTaskStepId}
-        AND `operation_type` = #{operationType}
+        <if test="operationType != null and operationType != ''">
+            AND `operation_type` = #{operationType}
+        </if>
     </delete>
 
     <delete id="deleteProcessTaskStepInOperationByServerId" parameterType="java.lang.Long">
-- 
Gitee