优化查询流程

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()+";");
+        CaseLogRecord caseLogRecordin = new CaseLogRecord();
+        List<MsCaseLogRecordVO> caseLogRecordsin = new ArrayList<>();
+        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));
+                    }
                 }
-                caseLogRecordin.setNextRoleName("下一节点角色："+roleIn1.toString().substring(0,roleIn1.toString().length()-1));
             }
+
+            MsCaseLogRecordVO msCaseLogRecordVO = new MsCaseLogRecordVO();
+            BeanUtil.copyProperties(caseLogRecordin, msCaseLogRecordVO);
+            caseLogRecordsin.add(msCaseLogRecordVO);
         }
-        MsCaseLogRecordVO msCaseLogRecordVO = new MsCaseLogRecordVO();
-        BeanUtil.copyProperties(caseLogRecordin, msCaseLogRecordVO);
-        List<MsCaseLogRecordVO> caseLogRecordsin = new ArrayList<>();
-        caseLogRecordsin.add(msCaseLogRecordVO);
 
         List<MsCaseFlow> nextFlowall = caseFlowMapper.nextFlowall(caseApplicationselect.getCaseFlowId());
         List<MsCaseLogRecordVO> caseLogRecordsnext = new ArrayList<>();