diff --git a/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java b/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java index 05bce28..fe72b74 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java @@ -40,7 +40,7 @@ public class TrainingApplyProcessAddExe { List trainingApplyProcessDOList = trainingApplyProcessRepository.getApproveDetailList(cmd.getTrainingApplyRecordId()); //获取ttrainingApplyProcessDOList 中按照创建时间最后一条数据,将审批时间设置为当前时间 List collect = trainingApplyProcessDOList.stream() - .filter(item -> item.getApprovalTime() != null) + .filter(item -> item.getApprovalTime() == null) .collect(Collectors.toList()); if(CollUtil.isNotEmpty( collect)){ TrainingApplyProcessDO trainingApplyProcessDO = collect.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get(); diff --git a/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java index 38fbfbe..2a1c79b 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java @@ -73,7 +73,7 @@ public class TrainingApplyRecordUpdateExe { List trainingApplyProcessDOList = trainingApplyProcessRepository.getApproveDetailList(trainingApplyRecordUpdateCmd.getTrainingApplyRecordId()); //获取ttrainingApplyProcessDOList 中按照创建时间最后一条数据,将审批时间设置为当前时间 List collect = trainingApplyProcessDOList.stream() - .filter(item -> item.getApprovalTime() != null) + .filter(item -> item.getApprovalTime() == null) .collect(Collectors.toList()); if(CollUtil.isNotEmpty( collect)){ TrainingApplyProcessDO trainingApplyProcessDO = collect.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get();