From f796fbf79025075fd9ec0e61b43f06106fc0916c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 28 Dec 2023 14:02:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=93=E6=9D=9F=E4=B9=8B=E5=90=8E=20=E4=B8=BB?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E4=BA=BA=E5=AD=97=E6=AE=B5=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=20=E8=AF=84=E5=AE=A1=E4=BC=9A=E8=AE=B0=E5=BD=95=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevision/listener/ProcessESRevisionEndListener.java      | 3 +--
 .../process/esRevision/service/impl/EsRevisionServiceImpl.java | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
index e9d4feed..b8a6a112 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
@@ -97,9 +97,8 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
         lawsCommonService.commonAdd(variables);
         String espId = data.getEspId();
         EnterpriseStandardPlan esp = espService.getById(espId);
-        String newStandardNo = esp.getNewEnStandardNo();
         LambdaQueryWrapper<LawsEnterpriseStandard> esWrapper = new LambdaQueryWrapper<>();
-        esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, newStandardNo);
+        esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber);
         LawsEnterpriseStandard es = esService.getOne(esWrapper);
         // 保存评审会记录
         EnterpriseStandardReviewMeetingRecord esRmr = new EnterpriseStandardReviewMeetingRecord();
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 94e67b88..06cbec0d 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
@@ -361,6 +361,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 // 保存打分记录
                 data = revisionData.getData();
                 List<ReviewMeetingDetailVO> reviewMeetingDetails = data.getReviewMeetingDetails();
+                // 设置当前评分人
+                reviewMeetingDetails.forEach(reviewMeetingDetail -> reviewMeetingDetail.setAdjudicatorId(curUserId));
                 ProcessEsRevision revisionDb = getById(dataDb.getId());
                 List<ReviewMeetingDetailVO> reviewMeetingDetailsDb = revisionDb.parseReviewMeetingDetails();
                 if (reviewMeetingDetailsDb == null) {