From 26a1fd94a0b59f759e31bb30ba4db434874c4733 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Thu, 6 Mar 2025 10:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseAccadjApplyService.java               | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
index 1060a2b321..1d83e0243c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@@ -472,7 +472,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             formVariables.put("isAdj", i);
         }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
-            bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
@@ -828,11 +827,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     nextNodeUserSids.append(sid).append(",");
                 }
             }
-            if (StringUtils.isBlank(nextNodeUserSids)) {
-                return rb.setMsg("下一环节暂无操作人员");
+            if (StringUtils.isBlank(nextNodeUserSids)){
+                bv.setNextNodeUserSids("");
+            }else {
+                String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+                bv.setNextNodeUserSids(substring);
             }
-            String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-            bv.setNextNodeUserSids(substring);
         }
         if (baseAccadjApply.getAccadjTypeValue().equals("调出")) {
             String callInOrgSid = baseAccadjApply.getCallInOrgSid();
@@ -852,12 +852,15 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         nextNodeUserSids.append(sid).append(",");
                     }
                 }
-                String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-                bv.setNextNodeUserSids(substring);
+                if (StringUtils.isBlank(nextNodeUserSids)){
+                    bv.setNextNodeUserSids("");
+                }else {
+                    String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+                    bv.setNextNodeUserSids(substring);
+                }
             }
         }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
-            bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
@@ -920,11 +923,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 nextNodeUserSids.append(sid).append(",");
             }
         }
-        if (StringUtils.isBlank(nextNodeUserSids)) {
-            return rb.setMsg("下一环节暂无操作人员");
+        if (StringUtils.isBlank(nextNodeUserSids)){
+            bv.setNextNodeUserSids("");
+        }else {
+            String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+            bv.setNextNodeUserSids(substring);
         }
-        String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-        bv.setNextNodeUserSids(substring);
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowFeign.handleProsess(bv);
             if (!resultBean1.getSuccess()) {