diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java index eec6517..f86f831 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/BaseApprovalServiceImpl.java @@ -512,8 +512,19 @@ if (resultList.size() == 1 && resultList.get(0).size() == 1) { resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过")); } + if (!CollectionUtils.isEmpty(resultList)) { - resultList = resultList.stream().filter(element -> !(element == null || element.isEmpty())).collect(Collectors.toList()); + List> finalList = new ArrayList<>(); + for (List elementList : resultList) { + List approvalLogs = new ArrayList<>(); + for (ApprovalLogResponse element : elementList) { + if (StringUtils.isNotBlank(element.getAssigneeName())) { + approvalLogs.add(element); + } + } + finalList.add(approvalLogs); + } + resultList = finalList; } return resultList;