From 5e4fe7df9755cf64b44f11dc1eeac0dd2ce5c17c Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Wed, 21 Feb 2024 14:20:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E7=9C=8B=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mscase/impl/MsSignSealServiceImpl.java    | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
index ccdadfd..39b00ff 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
@@ -471,13 +471,17 @@ public class MsSignSealServiceImpl implements MsSignSealService {
         caseLogRecordin.setContent(roleIn.toString().substring(0,roleIn.toString().length()-1));
 
         MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseFlowId);
-        List<MsCaseFlowVO> nextMsCaseFlowvo = caseFlowMapper.selectFlowRole(nextFlow.getId());
-        StringBuilder roleIn1 = new StringBuilder();
-        for(MsCaseFlowVO mscaseFlowVO:nextMsCaseFlowvo){
-            roleIn1.append( mscaseFlowVO.getRoleName()+";");
+        String nodeName = nextFlow.getNodeName();
+        if(StringUtils.isNotEmpty(nodeName)){
+            if(!"结束".equals(nodeName)){
+                List<MsCaseFlowVO> nextMsCaseFlowvo = caseFlowMapper.selectFlowRole(nextFlow.getId());
+                StringBuilder roleIn1 = new StringBuilder();
+                for(MsCaseFlowVO mscaseFlowVO:nextMsCaseFlowvo){
+                    roleIn1.append( mscaseFlowVO.getRoleName()+";");
+                }
+                caseLogRecordin.setNextRoleName("下一节点角色："+roleIn1.toString().substring(0,roleIn1.toString().length()-1));
+            }
         }
-        caseLogRecordin.setNextRoleName("下一节点角色："+roleIn1.toString().substring(0,roleIn1.toString().length()-1));
-
         MsCaseLogRecordVO msCaseLogRecordVO = new MsCaseLogRecordVO();
         BeanUtil.copyProperties(caseLogRecordin, msCaseLogRecordVO);
         List<MsCaseLogRecordVO> caseLogRecordsin = new ArrayList<>();
@@ -493,7 +497,14 @@ public class MsSignSealServiceImpl implements MsSignSealService {
 
                 StringBuilder rolenext = new StringBuilder();
                 for(MsCaseFlowVO mscaseFlowVO:msCaseFlowVOs){
-                    rolenext.append( mscaseFlowVO.getRoleName()+"将进行"+mscaseFlowVO.getNodeName()+";");
+                    String nodeName1 = mscaseFlowVO.getNodeName();
+                    if(StringUtils.isNotEmpty(nodeName1)){
+                        if("结束".equals(nodeName1)){
+                            rolenext.append("结束;");
+                        }else {
+                            rolenext.append( mscaseFlowVO.getRoleName()+"将进行"+mscaseFlowVO.getNodeName()+";");
+                        }
+                    }
                 }
                 caseLogRecord1.setContent( rolenext.toString().substring(0,rolenext.toString().length()-1));
                 caseLogRecordsnext.add(caseLogRecord1);