From 48aa6625f4c1025dcc7d8365148debf1c6ff4db9 Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Fri, 23 Feb 2024 11:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mscase/impl/MsSignSealServiceImpl.java    | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 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 39b00ff..76e6e94 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
@@ -460,32 +460,39 @@ public class MsSignSealServiceImpl implements MsSignSealService {
         MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(id);
         Integer caseFlowId = caseApplicationselect.getCaseFlowId();
         MsCaseFlow msCaseFlow = caseFlowMapper.selectByPrimaryKey(caseFlowId);
+
         CaseLogRecord caseLogRecordin = new CaseLogRecord();
-        caseLogRecordin.setCaseNodeName(msCaseFlow.getNodeName());
-        List<MsCaseFlowVO> msCaseFlowvos = caseFlowMapper.selectFlowRole(caseFlowId);
-
-        StringBuilder roleIn = new StringBuilder();
-        for(MsCaseFlowVO mscaseFlowVO:msCaseFlowvos){
-            roleIn.append( mscaseFlowVO.getRoleName()+"正在进行"+mscaseFlowVO.getNodeName()+";");
-        }
-        caseLogRecordin.setContent(roleIn.toString().substring(0,roleIn.toString().length()-1));
-
-        MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseFlowId);
-        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));
-            }
-        }
-        MsCaseLogRecordVO msCaseLogRecordVO = new MsCaseLogRecordVO();
-        BeanUtil.copyProperties(caseLogRecordin, msCaseLogRecordVO);
         List<MsCaseLogRecordVO> caseLogRecordsin = new ArrayList<>();
-        caseLogRecordsin.add(msCaseLogRecordVO);
+        if(!"结束".equals(msCaseFlow.getNodeName())){
+            caseLogRecordin.setCaseNodeName(msCaseFlow.getNodeName());
+            List<MsCaseFlowVO> msCaseFlowvos = caseFlowMapper.selectFlowRole(caseFlowId);
+            StringBuilder roleIn = new StringBuilder();
+            for(MsCaseFlowVO mscaseFlowVO:msCaseFlowvos){
+                if(!"结束".equals(mscaseFlowVO.getNodeName())){
+                    roleIn.append( mscaseFlowVO.getRoleName()+"正在进行"+mscaseFlowVO.getNodeName()+";");
+                }
+            }
+            caseLogRecordin.setContent(roleIn.toString().substring(0,roleIn.toString().length()-1));
+
+            MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseFlowId);
+            if(nextFlow!=null){
+                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));
+                    }
+                }
+            }
+
+            MsCaseLogRecordVO msCaseLogRecordVO = new MsCaseLogRecordVO();
+            BeanUtil.copyProperties(caseLogRecordin, msCaseLogRecordVO);
+            caseLogRecordsin.add(msCaseLogRecordVO);
+        }
 
         List<MsCaseFlow> nextFlowall = caseFlowMapper.nextFlowall(caseApplicationselect.getCaseFlowId());
         List<MsCaseLogRecordVO> caseLogRecordsnext = new ArrayList<>();