From f275f5b3b268512524e54980c9c74640d9d5ca2b Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Mon, 5 Feb 2024 15:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=8F=AF=E8=B7=B3=E8=BF=87=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/service/eightwork/impl/HotworkServiceImpl.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
index 624235c..203c73d 100644
--- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
+++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
@@ -145,9 +145,10 @@ public class HotworkServiceImpl implements HotworkService {
         List<PageData> unsignedList = hotworkSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
         if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步
 //            PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
-            hotworkMapper.editStep(work);
 
             PageData currentflow = getCurrentFlow(work);
+            work.put("STEP_ID", currentflow.get("STEP_ID"));
+            hotworkMapper.editStep(work);
 
             //保存日志
             saveLog(work,work.getString("USER_ID"),"1");
@@ -385,7 +386,7 @@ public class HotworkServiceImpl implements HotworkService {
         flow.put("TASK_ID", work.get("TASK_ID"));
         flow.put("STEP_ID", work.get("STEP_ID"));
         flow = eightWorkTaskFlowMapper.getStep(flow);
-        if("1".equals(flow.get("CAN_SKIP")) && (work.get(flow.get("NEXT_ACTOR_FIELD")) == null || work.get(flow.get("NEXT_ACTOR_FIELD")).equals(""))){
+        if("1".equals(flow.getString("CAN_SKIP")) && (work.get(flow.get("NEXT_ACTOR_FIELD")) == null || work.get(flow.get("NEXT_ACTOR_FIELD")).equals(""))){
             work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
             return getCurrentFlow(work);
         }else{