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 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 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 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);