From 956b406991fbac6939d5e7189abf43e21d6aaf71 Mon Sep 17 00:00:00 2001
From: "djz236@163.com" <djz236@163.com>
Date: Fri, 8 Sep 2023 14:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E7=AB=A0=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=9A=84=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/sysstafforg/SysStaffOrgMapper.xml  |  2 +-
 .../biz/sealrecord/SealRecordService.java     | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgMapper.xml
index 07dc1e40..5a93f1ff 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgMapper.xml
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgMapper.xml
@@ -61,7 +61,7 @@
      </select>-->
     <select id="selectBySidPathByStaffSid" resultType="java.lang.String">
         select orgSid
-        from anrui_portal.sys_staff_org
+        from sys_staff_org
         where staffSid = #{applySid} and manageType = '3'
         order by id desc
         limit 1
diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java
index 921847b2..31b0ed24 100644
--- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java
+++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java
@@ -420,6 +420,8 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
 		String nodeState = resultBean.getData().get(0).getName_();
 		String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
 		String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
+		String taskId = resultBean.getData().get(0).getId_();
+		String assignee_ = resultBean.getData().get(0).getASSIGNEE_();
 		Map<String, Object> map = new HashMap<>();
 		map.put("businessSid", businessSid);
        /* if (incomingSourceRef.contains("start")) {
@@ -431,7 +433,13 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
 		map.put("taskDefKey", taskDefKey);
 		map.put("flowState", nodeState);
 		/* }*/
-		sysFormLinkFeign.updateFiled(map);
+		UpdateFlowFieldVo updateFlowFieldVo=new UpdateFlowFieldVo();
+		updateFlowFieldVo.setSid(businessSid);
+		updateFlowFieldVo.setTaskDefKey(taskDefKey);
+		updateFlowFieldVo.setNodeState(nodeState);
+		updateFlowFieldVo.setTaskId(taskId);
+		updateFlowFieldVo.setNextNodeUserSids(assignee_);
+		updateFlowFiled(updateFlowFieldVo);
 		return new ResultBean().success();
 	}
 
@@ -444,6 +452,8 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
 		}
 		String nodeState = resultBean.getData().get(0).getName_();
 		String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
+		String taskId = resultBean.getData().get(0).getId_();
+		String assignee_ = resultBean.getData().get(0).getASSIGNEE_();
 		String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
 		Map<String, Object> map = new HashMap<>();
 		map.put("businessSid", businessSid);
@@ -452,7 +462,14 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
 //        if (incomingSourceRef.contains("start")) {
 		map.put("flowState", nodeState);
 //        }
-		sysFormLinkFeign.updateFiled(map);
+		UpdateFlowFieldVo updateFlowFieldVo=new UpdateFlowFieldVo();
+		updateFlowFieldVo.setSid(businessSid);
+		updateFlowFieldVo.setTaskDefKey(taskDefKey);
+		updateFlowFieldVo.setNodeState(nodeState);
+		updateFlowFieldVo.setTaskId(taskId);
+		updateFlowFieldVo.setNextNodeUserSids(assignee_);
+		updateFlowFiled(updateFlowFieldVo);
+		//this.updateFiled(map);
 		return new ResultBean().success();
 	}