diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java index e24c518..0013d07 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java @@ -261,14 +261,11 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setDeptName(policeLeaveApproval.getDeptName()); gwglLog.setUserId(policeLeaveApproval.getUserId()); gwglLog.setUserName(policeLeaveApproval.getName()); - gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); - gwglLog.setReason(policeLeaveApproval.getReason()); - gwglLog.setResult(state); + gwglLog.setCreateTime(System.currentTimeMillis()/1000L); + gwglLog.setResult(0); gwglLog.setType(policeLeaveApproval.getLeaveType()); - gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setChecker("刘成志和陈列"); - gwglLog.setCheckTime(System.currentTimeMillis()/1000L); - gwglLog.setCheckState(state); + gwglLog.setCheckState(0); boolean result1 = gwglLogService.save(gwglLog); } else if ("096484".equals(user.getUserName())) { //政治处侍昌鑫 @@ -282,14 +279,12 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setDeptName(policeLeaveApproval.getDeptName()); gwglLog.setUserId(policeLeaveApproval.getUserId()); gwglLog.setUserName(policeLeaveApproval.getName()); - gwglLog.setCreateTime(policeLeaveApproval.getCreateTime()); - gwglLog.setReason(policeLeaveApproval.getReason()); + gwglLog.setCreateTime(System.currentTimeMillis()/1000L); gwglLog.setResult(state); gwglLog.setType(policeLeaveApproval.getLeaveType()); - gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setChecker("刘成志和陈列"); gwglLog.setCheckTime(System.currentTimeMillis()/1000L); - gwglLog.setCheckState(state); + gwglLog.setCheckState(0); boolean result1 = gwglLogService.save(gwglLog); } else if ("admin".equals(user.getUserName())) { // 管理员看所有