diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 4aeee12..3ce3733 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -66,7 +66,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 4aeee12..3ce3733 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -66,7 +66,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 9d997fa..a13b109 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -167,7 +167,7 @@
             and dv.onlinestate ='0'
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline != 0 ">
-            and (dv.onlinestate ='1' or  bds.onlinestate is null)
+            and dv.onlinestate  <![CDATA[ <> ]]> '0'
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 4aeee12..3ce3733 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -66,7 +66,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="pgsql">
-        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+        TO_TIMESTAMP(${paramStr},'yyyy-MM-dd hh24:mi:ss')::timestamp without time zone
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 9d997fa..a13b109 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -167,7 +167,7 @@
             and dv.onlinestate ='0'
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline != 0 ">
-            and (dv.onlinestate ='1' or  bds.onlinestate is null)
+            and dv.onlinestate  <![CDATA[ <> ]]> '0'
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 613d8a1..26bb1d7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -193,9 +193,10 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page,Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType) , Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
+        deptid = null;
+        List<DeviceDto> deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
         deviceDtoList.forEach(
-                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1")
+                deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState().equals("0")  ? "0" : "1")
         );
         return deviceDtoList;
     }