浏览代码

修改出差用车审批后用车时间消失问题

user5 5 年之前
父节点
当前提交
620710f47e
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      src/main/java/com/jeeplus/modules/workleave/service/WorkLeaveService.java

+ 6 - 1
src/main/java/com/jeeplus/modules/workleave/service/WorkLeaveService.java

@@ -293,7 +293,12 @@ public class WorkLeaveService extends CrudService<WorkLeaveDao, WorkLeave> {
 	 */
 	 */
 	@Transactional(readOnly = false)
 	@Transactional(readOnly = false)
 	public String auditSave(WorkLeave workLeave, List<User> auditUsers) {
 	public String auditSave(WorkLeave workLeave, List<User> auditUsers) {
-		String userName = UserUtils.get(workLeave.getCreateBy().getId()).getName();
+        WorkLeave workLeaveinfo = workLeaveDao.get(workLeave.getId());
+        if (null == workLeave.getStartDate()){
+            workLeave.setStartDate(workLeaveinfo.getStartDate());
+            workLeave.setEndDate(workLeaveinfo.getEndDate());
+        }
+        String userName = UserUtils.get(workLeave.getCreateBy().getId()).getName();
 		Office office = officeService.get(workLeave.getOfficeId());
 		Office office = officeService.get(workLeave.getOfficeId());
 		String title = "申请人:"+userName;
 		String title = "申请人:"+userName;
 		String str  =  "出差申请编号:"+workLeave.getNum()+",所属部门:"+office.getName();
 		String str  =  "出差申请编号:"+workLeave.getNum()+",所属部门:"+office.getName();