From 20223f83167acfe74bf80057b9c7ecab7427a05f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 29 Jan 2024 14:18:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080457=20=E4=BC=81=E6=A0=87=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2-=E9=83=A8=E9=97=A8=E8=81=94=E7=BB=9C?=
 =?UTF-8?q?=E4=BA=BA=E6=B1=87=E6=80=BB=EF=BC=9A=E8=BF=99=E4=B8=AA=E9=80=89?=
 =?UTF-8?q?=E4=BA=BA=E6=98=AF=E4=BB=8E=E8=81=94=E7=BB=9C=E4=BA=BA=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E9=80=89=E6=8B=A9=E5=B9=B6=E4=B8=94=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BA=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=98=AF?=
 =?UTF-8?q?=E4=BB=8E=E5=85=A8=E9=83=A8=E4=BA=BA=E5=91=98=E9=87=8C=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index e76db80f..5716c6ab 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -40,6 +40,8 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
+import com.jero.modules.laws.system.entity.LawsContactManage;
+import com.jero.modules.laws.system.service.ILawsContactManageService;
 import com.jero.modules.sys.utils.UserUtils;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserDepartService;
@@ -101,6 +103,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
     @Resource
     private SendMessageAPI sendMessageAPI;
 
+    @Resource
+    private ILawsContactManageService contactManageService;
 
     @Override
     public void startProcess(ESRevisionDataVO revisionData) {
@@ -337,8 +341,13 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                     data.setReviewUser(null);
                 }
             case CONTACT_USER_COLLECT:
-                String contactUserLeader = (String) runtimeService.getVariable(executionId, executionId + "-ContactUserLeader");
-                data.setContactUserLeader(contactUserLeader);
+                // 根据联络人找到部门联络人主管级领导
+                LambdaQueryWrapper<LawsContactManage> contactWrapper = new LambdaQueryWrapper<>();
+                contactWrapper.eq(LawsContactManage::getContactId, userId);
+                List<LawsContactManage> list = contactManageService.list(contactWrapper);
+                if (list != null && !list.isEmpty()) {
+                    data.setContactUserLeader(list.get(0).getLeaderId());
+                }
             case CONTACT_USER_LEADER_APPROVAL:
                 advicesWrapper.eq(EsRevisionAdvice::getExecutionId, executionId);
                 adviceList = adviceService.list(advicesWrapper);