From 8eb1fdea526ab3b7af3fa04d5df440c5b1afc0ac Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 16 Dec 2022 18:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=90=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=9A=84=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/commoncontract/CommonContractService.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index ed76527e7a..a4186f0323 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1361,9 +1361,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         ResultBean rb = ResultBean.fireFail();
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
         CommonContract commonContract = fetchBySid(dto.getContractSid());
-        commonContract.setStaffSid(dto.getUserSid());
-        commonContract.setStaffName(data.getStaffName());
-        commonContract.setOrgSid(data.getOrgSid());
+//        commonContract.setStaffSid(dto.getUserSid());
+//        commonContract.setStaffName(data.getStaffName());
+//        commonContract.setOrgSid(data.getOrgSid());
         String s1 = "";
         String s2 = "";
         String s3 = "";
@@ -2080,7 +2080,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getStaffSid())) {
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(commonContract.getCreateBySid())) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                 } else {
                     messageFlowableQuery.setMsgContent(commonContract.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");