From af2a6d1359852e377a0c77e09f815b29ed8a4b6f Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 10 Mar 2026 16:28:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(training):=20=E4=BF=AE=E5=A4=8D=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/edu/command/training/TrainingApplyProcessAddExe.java | 2 +- .../edu/command/training/TrainingApplyRecordUpdateExe.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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();