From 6534b619122e890b1f80203c1a22189916eb4446 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 10 Apr 2025 16:04:04 +0800
Subject: [PATCH] =?UTF-8?q?2025-04-10=20BOM=20Routing=20=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=B7=B2=E8=BD=AC=E6=AD=A3=E7=9A=84=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APIEntity/DoForceDrawBackParam2.java      | 11 ++++++++++
 .../impl/RequestManageServiceImpl.java        | 22 +++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/spring/modules/change/entity/APIEntity/DoForceDrawBackParam2.java

diff --git a/src/main/java/com/spring/modules/change/entity/APIEntity/DoForceDrawBackParam2.java b/src/main/java/com/spring/modules/change/entity/APIEntity/DoForceDrawBackParam2.java
new file mode 100644
index 00000000..938ac8eb
--- /dev/null
+++ b/src/main/java/com/spring/modules/change/entity/APIEntity/DoForceDrawBackParam2.java
@@ -0,0 +1,11 @@
+package com.spring.modules.change.entity.APIEntity;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class DoForceDrawBackParam2 {
+    private String userId;
+    private String requestId;
+}
diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
index b586b77a..eb597682 100644
--- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
+++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
@@ -376,23 +376,31 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
             }
 
             // 如果是节点更新则调用强制收回流程接口，反之则跳过这一步
-//            if ("update".equals(data.getProcessFlag())) {
-                // 强制收回流程
+            // 强制收回流程
+            // 如果当前登录人 != 当前节点审批人 就传 ismonitor
+            if (!data.getUserId().equals(inData.getUpdateBy())) {
                 DoForceDrawBackParam doForceDrawBackParam = new DoForceDrawBackParam();
                 doForceDrawBackParam.setUserId(userId);
                 doForceDrawBackParam.setRequestId(requestId);
                 HashMap<String, Object> otherParams = new HashMap<>();
-                // 如果当前登录人 != 当前节点审批人 就传 ismonitor
-                if (!data.getUserId().equals(inData.getUpdateBy())) {
-                    otherParams.put("ismonitor", "1");
-                }
+                otherParams.put("ismonitor", "1");
                 doForceDrawBackParam.setOtherParams(otherParams);
                 String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack";
                 ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam);
                 if (!"0".equals(doForceDrawBackResponses.getCode())) {
                     throw new RuntimeException("强制收回流程异常信息：" + doForceDrawBackResponses.getMsg());
                 }
-//            }
+            } else {
+                DoForceDrawBackParam2 doForceDrawBackParam = new DoForceDrawBackParam2();
+                doForceDrawBackParam.setUserId(userId);
+                doForceDrawBackParam.setRequestId(requestId);
+                String doForceDrawBackURL = apiUrlOa + "/oa/interface/doForceDrawBack";
+                ResponseData doForceDrawBackResponses = HttpClientUtil.doPostByRawWithOA(doForceDrawBackURL, doForceDrawBackParam);
+                if (!"0".equals(doForceDrawBackResponses.getCode())) {
+                    throw new RuntimeException("强制收回流程异常信息：" + doForceDrawBackResponses.getMsg());
+                }
+            }
+
             // 流程代办删除接口，删除发送的消息
             DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam();
             deleteUserRequestInfoParam.setUserId(userId);