diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index dff66e9e..7afe0df2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -1346,24 +1346,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe if (i > 0 && exist){ // 条款校验 - long count = clauseSublistList.stream().filter(o -> - o.getItemNum().equals(itemNum) - && o.getItemTitle().equals(itemTitle)).count(); - if (count < 1){ - errorList.add("该数据在业务分派信息中不存在!"); - } - - LawsDocumentSplit lawsDocumentSplits = documentSplitMapper.selectOne( - new LambdaQueryWrapper() - .eq(LawsDocumentSplit::getInfoId, splitInfoId) - .eq(LawsDocumentSplit::getItemNum, itemNum)); - if (Objects.isNull(lawsDocumentSplits)){ - errorList.add("不存在条号为:" + itemNum + "的条款!"); + ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist = clauseSublistList.get(i); + if(processStandardInterpretClauseSublist.getItemNum().equals(itemNum) + && processStandardInterpretClauseSublist.getItemTitle().equals(itemTitle)){ + data.setClauseId(processStandardInterpretClauseSublist.getClauseId()); + data.setItemTitle(processStandardInterpretClauseSublist.getItemTitle()); + data.setItemContent(processStandardInterpretClauseSublist.getItemContent()); + data.setTranslation(processStandardInterpretClauseSublist.getTranslation()); }else { - data.setClauseId(lawsDocumentSplits.getId()); - data.setItemTitle(lawsDocumentSplits.getItemTitle()); - data.setItemContent(lawsDocumentSplits.getItemContent()); - data.setTranslation(lawsDocumentSplits.getTranslation()); + errorList.add("该数据在业务分派信息中不存在!"); } }