From ca05394a9e0d01db55fde835dbc9cb666dc0fab9 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 8 Oct 2024 11:20:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E8=BD=AE=E6=95=B0=E4=B8=80=E7=9B=B4=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java               | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
index 58c6b94c..cad2d4b2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
@@ -268,18 +268,19 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 if (!adviceList.isEmpty()) {
                     adviceList.forEach(advice -> {
                         advice.setProcessInstanceId(processInstanceId);
-                        advice.setBatchNum(maxBatchNum);
+                        advice.setBatchNum(maxBatchNum + 1);
                         advice.setCreateUserId(curUserId);
                     });
-                    adviceList.forEach(advice -> advice.setBatchNum(maxBatchNum));
                     adviceService.saveBatch(adviceList);
                 }
+                break;
             case ADVICE_COLLECT:
                 // 保存数据
                 adviceService.updateBatchById(adviceList);
                 // 给主起草人发消息
                 String mainDraftUser = (String) taskService.getVariable(taskId, MAIN_DRAFT_USER);
                 this.sendMessageToMainDraftUser(mainDraftUser, processInstanceId, maxBatchNum);
+                break;
             case SET_STANDARD_NUMBER:
                 // 判断标准编号是否重复
                 Map<String, Object> variables = JSON.parseObject(data.getBusinessJson(), Map.class);
@@ -313,6 +314,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 }
                 // 保存数据
                 updateById(data);
+                break;
         }
         // 审批节点
         actFlowCommonService.completeTask(taskId, curUserId);
@@ -325,7 +327,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
     }
 
     private Integer calculateAdviceBatchNum(List<EsRevisionAdvice> adviceList) {
-        return adviceList.stream().mapToInt(EsRevisionAdvice::getBatchNum).max().orElse(1);
+        return adviceList.stream().mapToInt(EsRevisionAdvice::getBatchNum).max().orElse(0);
     }
 
     private void sendMessageToMainDraftUser(String mainDraftUser, String processInstanceId, Integer maxBatchNum) {