diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
index 59445d68a970b465dd395eb7f21274ab5c4a3e6e..d22bdfd2e227accd8e667f3a96c5cbfd5fdffd32 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
@@ -304,13 +304,4 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     }
 
 
-    @RequestMapping("parseToken")
-    public IUser parseToken() throws Exception {
-        IUser userEntity = authTokenService.getLoginUser(request);
-        if (!ObjectUtils.isEmpty(userEntity)) {
-            authTokenService.verifyToken(userEntity);
-            return userEntity;
-        }
-        return null;
-    }
 }
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
index e8f3c2f52e4e9e571f7ffbfa40761ed1ebddf3d9..cc4e6d9b9dda2a48768b9ada1b6a43262c7fc74f 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java
@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.service.impl;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.DataUtil;
 import com.mortals.xhx.busiz.h5.req.AttendSaveReq;
 import com.mortals.xhx.busiz.h5.web.ApiWebPerformController;
 import com.mortals.xhx.common.code.ErrorStatusEnum;
@@ -81,39 +82,51 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
         if (YesNoEnum.YES.getValue() == entity.getProcessStatus()) {
             //鍒ゆ柇鍚庢墦缁╂晥
             String ruleCode = "";
-            if (ErrorStatusEnum.鏃╅€€.getValue() == entity.getErrorStatus()) {
-                //鍒ゆ柇鏃堕棿宸畾涔�
-                Long earlyMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
+            if (ErrorStatusEnum.鏃╅€€.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
 
-                if (earlyMin >= 0L && earlyMin < 5L) {
+                if (ObjectUtils.isEmpty(entity.getErrorDateTime()) || ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
                     //鏃╅€€5鍒嗛挓鍐�
                     ruleCode = "ATTEND1002";
                 }
-                if (earlyMin >= 5L && earlyMin < 60L) {
-                    //鏃╅€€5鍒嗛挓鍐�
-                    ruleCode = "ATTEND1004";
+                if (!ObjectUtils.isEmpty(entity.getErrorDateTime()) && !ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
+                    //鍒ゆ柇鏃堕棿宸畾涔�
+                    Long earlyMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
+
+                    if (earlyMin >= 0L && earlyMin < 5L) {
+                        //鏃╅€€5鍒嗛挓鍐�
+                        ruleCode = "ATTEND1002";
+                    }
+                    if (earlyMin >= 5L && earlyMin < 60L) {
+                        //鏃╅€€5鍒嗛挓鍐�
+                        ruleCode = "ATTEND1004";
+                    }
+                    if (earlyMin >= 60L) {
+                        //鏃╅€€5鍒嗛挓鍐�
+                        ruleCode = "ATTEND1006";
+                    }
                 }
-                if (earlyMin >= 60L) {
+            } else if (ErrorStatusEnum.杩熷埌.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
+                if (ObjectUtils.isEmpty(entity.getErrorDateTime()) || ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
                     //鏃╅€€5鍒嗛挓鍐�
-                    ruleCode = "ATTEND1006";
-                }
-            } else if (ErrorStatusEnum.杩熷埌.getValue() == entity.getErrorStatus()) {
-
-                Long lateMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
-                if (lateMin >= 0L && lateMin < 5L) {
-                    //杩熷埌5鍒嗛挓鍐�
                     ruleCode = "ATTEND1001";
                 }
-                if (lateMin >= 5L && lateMin < 60L) {
-                    //杩熷埌5-60
-                    ruleCode = "ATTEND1003";
+                if (!ObjectUtils.isEmpty(entity.getErrorDateTime()) && !ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
+
+                    Long lateMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
+                    if (lateMin >= 0L && lateMin < 5L) {
+                        //杩熷埌5鍒嗛挓鍐�
+                        ruleCode = "ATTEND1001";
+                    }
+                    if (lateMin >= 5L && lateMin < 60L) {
+                        //杩熷埌5-60
+                        ruleCode = "ATTEND1003";
+                    }
+                    if (lateMin >= 60L) {
+                        //杩熷埌60鍒嗛挓浠ヤ笂
+                        ruleCode = "ATTEND1005";
+                    }
                 }
-                if (lateMin >= 60L) {
-                    //杩熷埌60鍒嗛挓浠ヤ笂
-                    ruleCode = "ATTEND1005";
-                }
-
-            } else if (ErrorStatusEnum.缂哄崱.getValue() == entity.getErrorStatus()) {
+            } else if (ErrorStatusEnum.缂哄崱.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
                 ruleCode = "ATTEND1007";
             }
             if (!ObjectUtils.isEmpty(ruleCode)) {
@@ -130,7 +143,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
                 attendSaveReq.setHappenTime(entity.getErrorDateTime());
                 attendSaveReq.setRuleCode(ruleCode);
                 attendSaveReq.setStaffId(entity.getStaffId());
-                attendRecordService.saveAttend(attendSaveReq,context);
+                attendRecordService.saveAttend(attendSaveReq, context);
             }
         }
     }