From d3e3cec01e847287f282afa0be0ac13be89c2522 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 21 Mar 2024 13:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java
index 06d8c409..3534c353 100644
--- a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java
+++ b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java
@@ -63,10 +63,14 @@ public class GuFenCharge extends NodeSwitchComponent {
         condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
         PageData entity = xgfUserMapper.findById(condition);
 
+        condition.clear();
+        condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
+        PageData userInfo = xgfUserDetailsMapper.findById(condition);
+
         // 如果不是当前流程，进入下一流程判断
         if (!"0".equals(info.getIterator())) {
             // 根据是否有委托书判断是否走委托流程
-            if (entity.get("ATTORNEY") != null && StringUtils.isNotBlank(entity.getString("ATTORNEY"))) {
+            if (userInfo.get("ATTORNEY") != null && StringUtils.isNotBlank(userInfo.getString("ATTORNEY"))) {
                 return "GuFenWeiTuo";
             }
             return "GuFenSupervise";
@@ -93,9 +97,6 @@ public class GuFenCharge extends NodeSwitchComponent {
             }
             // created by liu jun 2024-02-04 如果有委托书则保存委托书
             if (StringUtils.isNotBlank(info.getATTORNEY())) {
-                condition.clear();
-                condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
-                PageData userInfo = xgfUserDetailsMapper.findById(condition);
                 userInfo.put("ATTORNEY", info.getAPPOINT_ANNEX());
                 xgfUserDetailsMapper.edit(userInfo);
             }
@@ -107,7 +108,7 @@ public class GuFenCharge extends NodeSwitchComponent {
         // 保存操作记录
         xgfUserService.saveLog(info, info.getSTATUS(), "0");
 
-        if (entity.get("ATTORNEY") != null && StringUtils.isNotBlank(entity.getString("ATTORNEY"))) {
+        if (StringUtils.isNotBlank(info.getATTORNEY())) {
             return "GuFenWeiTuo";
         }
         return "GuFenSupervise";