From 2f212f9ab67ca6da74d26492e8f1663fae812129 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 27 Dec 2023 11:16:03 +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=AC=AC=E5=9B=9B=E4=B8=AA=E8=8A=82=E7=82=B9=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/esRevision/entity/ProcessEsRevision.java         | 3 ---
 .../esRevision/service/impl/EsRevisionServiceImpl.java       | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
index 6598e560..d95d37e0 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
@@ -112,7 +112,6 @@ public class ProcessEsRevision implements Serializable {
     /**
      * 是否需要稽查 0不需要 1需要
      */
-    @TableField(exist = false)
     @ApiModelProperty(value = "是否需要稽查 0不需要 1需要")
     private String inspectFlag;
 
@@ -176,14 +175,12 @@ public class ProcessEsRevision implements Serializable {
     /**
      * 会议纪要
      */
-    @TableField(exist = false)
     @ApiModelProperty(value = "会议纪要")
     private String meetingSummary;
 
     /**
      * 参会人员
      */
-    @TableField(exist = false)
     @ApiModelProperty(value = "参会人员")
     private String meetingUsers;
 
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 2342d47a..8dfcc642 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
@@ -337,9 +337,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 break;
             case STANDARDIZATION_CHECK:
                 // 判断是否可以评审
-                data = revisionData.getData();
-                boolean reviewMeetingFlag = !data.getReviewMeetingFlag().equals("0");
-                if (reviewMeetingFlag) {
+                if (pass) {
+                    data = revisionData.getData();
                     List<String> raterList = Arrays.asList(data.getRaters().split(","));
                     taskService.setVariable(taskId, "raterList", raterList);
                     // 保存流程数据