diff --git a/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java b/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java
index 57af62d..fb8c4ab 100644
--- a/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java
+++ b/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java
@@ -136,7 +136,7 @@ public class LogAspect
                 sysLogsVo.setOperaUserName(username);
             }
             Long userId = SecurityUtils.getUserId();
-            if (userId!=null && userId!=0l) {
+            if (userId!=null && userId!=0L) {
                 sysLogsVo.setUserId(userId.toString());
             }
             sysLogsVo.setOperaUri(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
diff --git a/bonus-modules/bonus-job/src/main/java/com/bonus/job/service/SysJobServiceImpl.java b/bonus-modules/bonus-job/src/main/java/com/bonus/job/service/SysJobServiceImpl.java
index 0fecd9f..4f166a8 100644
--- a/bonus-modules/bonus-job/src/main/java/com/bonus/job/service/SysJobServiceImpl.java
+++ b/bonus-modules/bonus-job/src/main/java/com/bonus/job/service/SysJobServiceImpl.java
@@ -377,9 +377,9 @@ public class SysJobServiceImpl implements ISysJobService {
                     } else if (date.compareTo(delayTime) > 0 && "2".equals(item.getIsCheck())) {
                         item.setCheckStatus("8");
                     } else if (date.compareTo(delayTime) <= 0 && !"2".equals(item.getIsCheck())) {
-                        item.setCheckStatus("7");
-                    } else if (date.compareTo(delayTime) > 0 && !"2".equals(item.getIsCheck())) {
                         item.setCheckStatus("3");
+                    } else if (date.compareTo(delayTime) > 0 && !"2".equals(item.getIsCheck())) {
+                        item.setCheckStatus("7");
                     }
                 } else {
                     //判断整改时间是否大于当前时间
@@ -387,9 +387,9 @@ public class SysJobServiceImpl implements ISysJobService {
                         item.setCheckStatus("2");
                     } else if (date.compareTo(correctionTime) > 0 && "2".equals(item.getIsCheck())) {
                         item.setCheckStatus("6");
-                    } else if (date.compareTo(correctionTime) <= 0 && !"2".equals(item.getIsCheck())) {
-                        item.setCheckStatus("5");
                     } else if (date.compareTo(correctionTime) > 0 && !"2".equals(item.getIsCheck())) {
+                        item.setCheckStatus("5");
+                    } else if (date.compareTo(correctionTime) <= 0 && !"2".equals(item.getIsCheck())) {
                         item.setCheckStatus("1");
                     }
                 }
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/DeviceInformationMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/DeviceInformationMapper.xml
index 4a0da97..9a6c72d 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/system/DeviceInformationMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/DeviceInformationMapper.xml
@@ -43,7 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         pdi.device_phone AS devicePhone,
         pdi.create_user AS createUser,
         pdi.create_time AS createTime,
-        pdi.puid,pdi.type_code typeCode,
+        pdi.puid, pdi.device_status deviceStatus,
+        pdi.type_code typeCode,
         pdi.ball_index as ballIndex,
         if(ppi.pro_name IS NULL, '无', ppi.pro_name) AS proName
         FROM