diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java index 7cfb105..3df16a9 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java @@ -37,6 +37,16 @@ public class LeaveApproveListener implements ExecutionListener { // 获取请假天数 BigDecimal leaveDays = (BigDecimal) delegateExecution.getVariable("leaveDays"); + if (leaveDays == null) { + String leaveAppId = delegateExecution.getVariable("leaveApplicationId").toString(); + if (leaveAppId != null) { + StuLeaveApplication stu = leaveMapper.selectRtStuLeaveApplicationByLeaveApplicationId(leaveAppId); + if (stu != null && stu.getLeaveDays() != null) { + leaveDays = new BigDecimal(stu.getLeaveDays().toString()); + delegateExecution.setVariable("leaveDays", leaveDays); + } + } + } // 请假单id // 报错信息 diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java index bd41ead..2641869 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/LeaveStartApproveListener.java @@ -30,6 +30,16 @@ public class LeaveStartApproveListener implements ExecutionListener { // 获取请假天数 BigDecimal leaveDays = (BigDecimal) delegateExecution.getVariable("leaveDays"); + if (leaveDays == null) { + String leaveAppId = delegateExecution.getVariable("leaveApplicationId").toString(); + if (leaveAppId != null) { + StuLeaveApplication stu = leaveMapper.selectRtStuLeaveApplicationByLeaveApplicationId(leaveAppId); + if (stu != null && stu.getLeaveDays() != null) { + leaveDays = new BigDecimal(stu.getLeaveDays().toString()); + delegateExecution.setVariable("leaveDays", leaveDays); + } + } + } // 辅导员审批结果 String approval = delegateExecution.getVariable("approval").toString();