diff --git a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java index 04d6a18..77efce3 100644 --- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java +++ b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java @@ -144,19 +144,20 @@ public class ApplyCompletionAction implements Action { .setNegativeId(negative.getId()) .setCrtTime(now) .setUpdTime(now); + List blameLeaders = verifyData.getBlameLeaders().stream() + .filter(leader -> leader.getBlameIdCodes().contains(item.getBlameIdCode())) + .toList(); + if(!blameLeaders.isEmpty()) { + BeanUtil.copyProperties(blameLeaders.get(0), negativeBlame); + + } // 属实 if (InspectCaseEnum.isItTure(verifyData.getCheckStatus())) { if (CollectionUtil.isNotEmpty(item.getHandleResultCode())) { negativeBlame.setHandleResultCode(String.join(",", item.getHandleResultCode())); } - List blameLeaders = verifyData.getBlameLeaders().stream() - .filter(leader -> leader.getBlameIdCodes().contains(item.getBlameIdCode())) - .toList(); - if(!blameLeaders.isEmpty()) { - BeanUtil.copyProperties(blameLeaders.get(0), negativeBlame); - if (CollectionUtil.isNotEmpty(blameLeaders.get(0).getLeadHandleResultCode())) { - negativeBlame.setLeadHandleResultCode(String.join(",", blameLeaders.get(0).getLeadHandleResultCode())); - } + if (!blameLeaders.isEmpty() && CollectionUtil.isNotEmpty(blameLeaders.get(0).getLeadHandleResultCode())) { + negativeBlame.setLeadHandleResultCode(String.join(",", blameLeaders.get(0).getLeadHandleResultCode())); } problemRelations.addAll(item.getProblems().stream().filter(problem -> StrUtil.isNotBlank(problem.getOneLevelCode())).map(problem -> { NegativeProblemRelation problemRelation = new NegativeProblemRelation();