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 b9990eb..44bc08b 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
@@ -146,6 +146,7 @@ public class PoliceLeaveApprovalController extends BaseController {
             gwglLog gwglLog = new gwglLog();
             gwglLog.setApplyNo(s);
             gwglLog.setResult(1);
+            gwglLog.setCheckState(0);
             gwglLog.setDeptId(user.getDeptId());
             gwglLog.setDeptName(user.getDept().getDeptName());
             gwglLog.setUserId(user.getUserId());
@@ -219,21 +220,53 @@ public class PoliceLeaveApprovalController extends BaseController {
             if (state == 2) {
                 policeLeaveApproval.setState(2);
             }
+//            gwglLog gwglLog = new gwglLog();
+//            gwglLog.setApplyNo(policeLeaveApproval.getApplyNo());
+//            gwglLog.setDeptId(policeLeaveApproval.getDeptId());
+//            gwglLog.setDeptName(policeLeaveApproval.getDeptName());
+//            gwglLog.setUserId(policeLeaveApproval.getUserId());
+//            gwglLog.setUserName(policeLeaveApproval.getName());
+//            gwglLog.setCreateTime(policeLeaveApproval.getCreateTime());
+//            gwglLog.setReason(policeLeaveApproval.getReason());
+//            gwglLog.setResult(state);
+//            gwglLog.setType(1);
+//            gwglLog.setReason(policeLeaveApproval.getReason());
+//            gwglLog.setChecker(user.getNickName());
+//            gwglLog.setCheckTime(System.currentTimeMillis());
+//            gwglLog.setCheckState(state);
+//            boolean result1 = gwglLogService.save(gwglLog);
+            gwglLog one = gwglLogService.lambdaQuery()
+                    .eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo())
+                    .orderByDesc(gwglLog::getCreateTime)
+                    .last("LIMIT 1")
+                    .one();
+            one.setApplyNo(policeLeaveApproval.getApplyNo());
+            one.setDeptId(policeLeaveApproval.getDeptId());
+            one.setDeptName(policeLeaveApproval.getDeptName());
+            one.setUserId(policeLeaveApproval.getUserId());
+            one.setUserName(policeLeaveApproval.getName());
+            one.setCreateTime(policeLeaveApproval.getCreateTime());
+            one.setReason(policeLeaveApproval.getReason());
+            one.setResult(state);
+            one.setType(1);
+            one.setReason(policeLeaveApproval.getReason());
+            one.setChecker(user.getNickName());
+            one.setCheckTime(System.currentTimeMillis());
+            one.setCheckState(state);
+            boolean result = gwglLogService.updateById(one);
+
+
             gwglLog gwglLog = new gwglLog();
             gwglLog.setApplyNo(policeLeaveApproval.getApplyNo());
-            gwglLog.setDeptId(policeLeaveApproval.getDeptId());
-            gwglLog.setDeptName(policeLeaveApproval.getDeptName());
-            gwglLog.setUserId(policeLeaveApproval.getUserId());
-            gwglLog.setUserName(policeLeaveApproval.getName());
-            gwglLog.setCreateTime(policeLeaveApproval.getCreateTime());
-            gwglLog.setReason(policeLeaveApproval.getReason());
-            gwglLog.setResult(state);
-            gwglLog.setType(1);
-            gwglLog.setReason(policeLeaveApproval.getReason());
-            gwglLog.setChecker(user.getNickName());
-            gwglLog.setCheckTime(System.currentTimeMillis());
-            gwglLog.setCheckState(state);
-            boolean result1 = gwglLogService.save(gwglLog);
+            gwglLog.setResult(1);
+            gwglLog.setDeptId(user.getDeptId());
+            gwglLog.setDeptName(user.getDept().getDeptName());
+            gwglLog.setUserId(user.getUserId());
+            gwglLog.setChecker(user.getDept().getLeader());
+            gwglLog.setUserName(user.getNickName());
+            gwglLog.setCheckState(0);
+            gwglLog.setCreateTime(new Date().getTime());
+            gwglLogService.save(gwglLog);
         } else if ("096484".equals(user.getUserName())) {
             //政治处侍昌鑫
             policeLeaveApproval.setZzcState(state);
@@ -251,7 +284,7 @@ public class PoliceLeaveApprovalController extends BaseController {
             gwglLog.setResult(state);
             gwglLog.setType(policeLeaveApproval.getLeaveType());
             gwglLog.setReason(policeLeaveApproval.getReason());
-            gwglLog.setChecker(user.getNickName());
+            gwglLog.setChecker("刘成志和陈列");
             gwglLog.setCheckTime(System.currentTimeMillis());
             gwglLog.setCheckState(state);
             boolean result1 = gwglLogService.save(gwglLog);
@@ -283,21 +316,25 @@ public class PoliceLeaveApprovalController extends BaseController {
                 policeLeaveApproval.setState(2);
             }
             policeLeaveApproval.setLeaderState(state);
-            gwglLog gwglLog = new gwglLog();
-            gwglLog.setApplyNo(policeLeaveApproval.getApplyNo());
-            gwglLog.setDeptId(policeLeaveApproval.getDeptId());
-            gwglLog.setDeptName(policeLeaveApproval.getDeptName());
-            gwglLog.setUserId(policeLeaveApproval.getUserId());
-            gwglLog.setUserName(policeLeaveApproval.getName());
-            gwglLog.setCreateTime(policeLeaveApproval.getCreateTime());
-            gwglLog.setReason(policeLeaveApproval.getReason());
-            gwglLog.setResult(state);
-            gwglLog.setType(policeLeaveApproval.getLeaveType());
-            gwglLog.setReason(policeLeaveApproval.getReason());
-            gwglLog.setChecker(user.getNickName());
-            gwglLog.setCheckTime(System.currentTimeMillis());
-            gwglLog.setCheckState(state);
-            boolean result1 = gwglLogService.save(gwglLog);
+            gwglLog one = gwglLogService.lambdaQuery()
+                    .eq(gwglLog::getApplyNo, policeLeaveApproval.getApplyNo())
+                    .orderByDesc(gwglLog::getCreateTime)
+                    .last("LIMIT 1")
+                    .one();
+            one.setApplyNo(policeLeaveApproval.getApplyNo());
+            one.setDeptId(policeLeaveApproval.getDeptId());
+            one.setDeptName(policeLeaveApproval.getDeptName());
+            one.setUserId(policeLeaveApproval.getUserId());
+            one.setUserName(policeLeaveApproval.getName());
+            one.setCreateTime(policeLeaveApproval.getCreateTime());
+            one.setReason(policeLeaveApproval.getReason());
+            one.setResult(state);
+            one.setType(1);
+            one.setReason(policeLeaveApproval.getReason());
+            one.setChecker(user.getNickName());
+            one.setCheckTime(System.currentTimeMillis());
+            one.setCheckState(state);
+            boolean result1 = gwglLogService.updateById(one);
             boolean result = approvalsProcessService.lambdaUpdate()
                     .eq(ApprovalProcess::getUuid, policeLeaveApproval.getUuid())
                     .set(ApprovalProcess::getApprovalStatus, state)