diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java index 13b07a0..825d391 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java @@ -233,6 +233,8 @@ public class SafetyEnvironmentalInspectionAddExe { queryWrapper.eq("key_project_id", cmd.getKeyProjectId()); queryWrapper.ne("apply_status", 0); queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByDesc("update_time"); + queryWrapper.last("limit 1"); KeyProjectDO keyProjectDO = keyProjectRepository.getOne(queryWrapper); List messageUserList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(cmd.getInspectionId(), 2); // todo 可能会导致异步任务被线程池拒绝 diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java index fd344a4..5af01f7 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionUpdateExe.java @@ -256,6 +256,8 @@ public class SafetyEnvironmentalInspectionUpdateExe { queryWrapper.eq("key_project_id", cmd.getKeyProjectId()); queryWrapper.ne("apply_status", 0); queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByDesc("update_time"); + queryWrapper.last("limit 1"); KeyProjectDO keyProjectDO = keyProjectRepository.getOne(queryWrapper); List messageUserList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(cmd.getInspectionId(), 2); for (SafetyEnvironmentalInspectionUserDO insUser : messageUserList){ @@ -425,6 +427,8 @@ public class SafetyEnvironmentalInspectionUpdateExe { queryWrapper.eq("key_project_id", cmd.getKeyProjectId()); queryWrapper.ne("apply_status", 0); queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.orderByDesc("update_time"); + queryWrapper.last("limit 1"); KeyProjectDO keyProjectDO = keyProjectRepository.getOne(queryWrapper); List messageUserList = safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(cmd.getInspectionId(), 5); for (SafetyEnvironmentalInspectionUserDO insUser : messageUserList){