diff --git a/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java b/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java index 0b89064..9042164 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java +++ b/src/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.java @@ -619,12 +619,14 @@ public class AskForLeaveServiceImpl extends Service implements AskForLeaveServic totalLeaveDuration = totalLeaveDuration + leaveDuration; } //减去编辑已使用时长 - Double checkItemEditedUseSc = editedUseJqlxWithEmp.get(checkItemId + "_" + empId); - Double firstItemEditedUseSc = editedUseJqlxWithEmp.get(firstItemId + "_" + empId); - totalLeaveDuration = Utils.subtract(totalLeaveDuration, checkItemEditedUseSc == null ? 0 : checkItemEditedUseSc); - totalLeaveDuration = Utils.subtract(totalLeaveDuration, firstItemEditedUseSc == null ? 0 : firstItemEditedUseSc); - //如果总时长为0,则退出 - if (totalLeaveDuration <= 0) { + Double checkItemEditedUseSc = editedUseJqlxWithEmp.getOrDefault(checkItemId + "_" + empId, (double) 0); + Double firstItemEditedUseSc = editedUseJqlxWithEmp.getOrDefault(firstItemId + "_" + empId, (double) 0); +// totalLeaveDuration = Utils.subtract(totalLeaveDuration, checkItemEditedUseSc == null ? 0 : checkItemEditedUseSc); +// totalLeaveDuration = Utils.subtract(totalLeaveDuration, firstItemEditedUseSc == null ? 0 : firstItemEditedUseSc); +// //如果总时长为0,则退出 + if (Utils.add(checkItemEditedUseSc, firstItemEditedUseSc) > 0) { + String message = empName + "在该请假类型的本次请假日期范围内,已存在开始日期相同的请假明细,请重新选择日期范围!"; + errorMessage.add(message); return result; } Map leaveDurationMap = new HashMap<>();