diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index b990166..2399620 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -33,7 +33,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+          ${paramStr}
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index b990166..2399620 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -33,7 +33,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+          ${paramStr}
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2f5affe..4e43e12 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -72,7 +72,7 @@
 
     <select id="deviceStaticsByDept" resultType="map">
         SELECT
-        BWI.DEPTID AS deptid,
+        BWI.DEPTID AS "deptid",
         COUNT( 1 ) AS "deviceCount"
         FROM
         bus_device BD

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index b990166..2399620 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -33,7 +33,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+          ${paramStr}
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2f5affe..4e43e12 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -72,7 +72,7 @@
 
     <select id="deviceStaticsByDept" resultType="map">
         SELECT
-        BWI.DEPTID AS deptid,
+        BWI.DEPTID AS "deptid",
         COUNT( 1 ) AS "deviceCount"
         FROM
         bus_device BD
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 d3b013a..c6aee96 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
@@ -273,7 +273,7 @@
       floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
     </sql>
 
-    <select id="offlineListPage" resultType="MAP">
+    <select id="offlineListPage" resultType="java.util.Map">
         SELECT
         bd.devcode AS devcode,
         bdt.TYPE_NAME AS "deviceTypeName",
@@ -300,7 +300,7 @@
 
 
     <sql id="time_diff" databaseId="oracle">
-       datediff(current_timestamp, Max(dt.logtime))
+       current_timestamp- Max(dt.logtime)
     </sql>
 
     <sql id="time_diff" databaseId="mysql">
@@ -311,7 +311,7 @@
      floor((extract(epoch    FROM CURRENT_TIMESTAMP ) - extract(epoch    FROM Max(dt.logtime)))/86400)
     </sql>
 
-    <select id="getOfflineTimeList" resultType="MAP">
+    <select id="getOfflineTimeList" resultType="java.util.Map">
         SELECT distinct(bd.devcode),Max(dt.logtime) AS "lastDataTs",
         <include refid="time_diff"/>
         AS "offlineDays"
@@ -333,13 +333,13 @@
         where id=#{id}
     </update>
 
-    <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+    <select id="getDeviceType" resultType="java.util.Map">
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
-    <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+    <select id="getDeptList" resultType="java.util.Map">
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index b990166..2399620 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -33,7 +33,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+          ${paramStr}
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2f5affe..4e43e12 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -72,7 +72,7 @@
 
     <select id="deviceStaticsByDept" resultType="map">
         SELECT
-        BWI.DEPTID AS deptid,
+        BWI.DEPTID AS "deptid",
         COUNT( 1 ) AS "deviceCount"
         FROM
         bus_device BD
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 d3b013a..c6aee96 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
@@ -273,7 +273,7 @@
       floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
     </sql>
 
-    <select id="offlineListPage" resultType="MAP">
+    <select id="offlineListPage" resultType="java.util.Map">
         SELECT
         bd.devcode AS devcode,
         bdt.TYPE_NAME AS "deviceTypeName",
@@ -300,7 +300,7 @@
 
 
     <sql id="time_diff" databaseId="oracle">
-       datediff(current_timestamp, Max(dt.logtime))
+       current_timestamp- Max(dt.logtime)
     </sql>
 
     <sql id="time_diff" databaseId="mysql">
@@ -311,7 +311,7 @@
      floor((extract(epoch    FROM CURRENT_TIMESTAMP ) - extract(epoch    FROM Max(dt.logtime)))/86400)
     </sql>
 
-    <select id="getOfflineTimeList" resultType="MAP">
+    <select id="getOfflineTimeList" resultType="java.util.Map">
         SELECT distinct(bd.devcode),Max(dt.logtime) AS "lastDataTs",
         <include refid="time_diff"/>
         AS "offlineDays"
@@ -333,13 +333,13 @@
         where id=#{id}
     </update>
 
-    <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+    <select id="getDeviceType" resultType="java.util.Map">
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
-    <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+    <select id="getDeptList" resultType="java.util.Map">
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
index 9170219..357e174 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
@@ -78,7 +78,7 @@
     </select>
 
     <select id="getDeviceTypeList" resultType="MAP">
-        SELECT  id,type_name AS  "typeName"
+        SELECT  id AS  "id",type_name AS  "typeName"
         FROM base_device_type
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index b990166..2399620 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -33,7 +33,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+          ${paramStr}
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2f5affe..4e43e12 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -72,7 +72,7 @@
 
     <select id="deviceStaticsByDept" resultType="map">
         SELECT
-        BWI.DEPTID AS deptid,
+        BWI.DEPTID AS "deptid",
         COUNT( 1 ) AS "deviceCount"
         FROM
         bus_device BD
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 d3b013a..c6aee96 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
@@ -273,7 +273,7 @@
       floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
     </sql>
 
-    <select id="offlineListPage" resultType="MAP">
+    <select id="offlineListPage" resultType="java.util.Map">
         SELECT
         bd.devcode AS devcode,
         bdt.TYPE_NAME AS "deviceTypeName",
@@ -300,7 +300,7 @@
 
 
     <sql id="time_diff" databaseId="oracle">
-       datediff(current_timestamp, Max(dt.logtime))
+       current_timestamp- Max(dt.logtime)
     </sql>
 
     <sql id="time_diff" databaseId="mysql">
@@ -311,7 +311,7 @@
      floor((extract(epoch    FROM CURRENT_TIMESTAMP ) - extract(epoch    FROM Max(dt.logtime)))/86400)
     </sql>
 
-    <select id="getOfflineTimeList" resultType="MAP">
+    <select id="getOfflineTimeList" resultType="java.util.Map">
         SELECT distinct(bd.devcode),Max(dt.logtime) AS "lastDataTs",
         <include refid="time_diff"/>
         AS "offlineDays"
@@ -333,13 +333,13 @@
         where id=#{id}
     </update>
 
-    <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+    <select id="getDeviceType" resultType="java.util.Map">
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
-    <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+    <select id="getDeptList" resultType="java.util.Map">
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
index 9170219..357e174 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
@@ -78,7 +78,7 @@
     </select>
 
     <select id="getDeviceTypeList" resultType="MAP">
-        SELECT  id,type_name AS  "typeName"
+        SELECT  id AS  "id",type_name AS  "typeName"
         FROM base_device_type
     </select>
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 9b0f16d..a265ad8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -43,7 +43,7 @@
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 设备编号

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index b990166..2399620 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -33,7 +33,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+          ${paramStr}
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2f5affe..4e43e12 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -72,7 +72,7 @@
 
     <select id="deviceStaticsByDept" resultType="map">
         SELECT
-        BWI.DEPTID AS deptid,
+        BWI.DEPTID AS "deptid",
         COUNT( 1 ) AS "deviceCount"
         FROM
         bus_device BD
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 d3b013a..c6aee96 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
@@ -273,7 +273,7 @@
       floor((extract(epoch    FROM  CURRENT_TIMESTAMP) - extract(epoch    FROM install_date))/86400)
     </sql>
 
-    <select id="offlineListPage" resultType="MAP">
+    <select id="offlineListPage" resultType="java.util.Map">
         SELECT
         bd.devcode AS devcode,
         bdt.TYPE_NAME AS "deviceTypeName",
@@ -300,7 +300,7 @@
 
 
     <sql id="time_diff" databaseId="oracle">
-       datediff(current_timestamp, Max(dt.logtime))
+       current_timestamp- Max(dt.logtime)
     </sql>
 
     <sql id="time_diff" databaseId="mysql">
@@ -311,7 +311,7 @@
      floor((extract(epoch    FROM CURRENT_TIMESTAMP ) - extract(epoch    FROM Max(dt.logtime)))/86400)
     </sql>
 
-    <select id="getOfflineTimeList" resultType="MAP">
+    <select id="getOfflineTimeList" resultType="java.util.Map">
         SELECT distinct(bd.devcode),Max(dt.logtime) AS "lastDataTs",
         <include refid="time_diff"/>
         AS "offlineDays"
@@ -333,13 +333,13 @@
         where id=#{id}
     </update>
 
-    <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+    <select id="getDeviceType" resultType="java.util.Map">
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
-    <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+    <select id="getDeptList" resultType="java.util.Map">
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
index 9170219..357e174 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
@@ -78,7 +78,7 @@
     </select>
 
     <select id="getDeviceTypeList" resultType="MAP">
-        SELECT  id,type_name AS  "typeName"
+        SELECT  id AS  "id",type_name AS  "typeName"
         FROM base_device_type
     </select>
 
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 9b0f16d..a265ad8 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -43,7 +43,7 @@
     /**
      * 主键
      */
-    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 设备编号
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
index 9f7449c..4f6cc60 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/TenantDeptServiceImpl.java
@@ -38,6 +38,9 @@
         Map<String, String> deptMap = getDeptList();
         Map<String, String> tenantDeptMap = getTenantDeptList();
         List<Tenant> tenants = abstractTenantService.list(query);
+        if(deptId==0){
+            return tenants.stream().map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());
+        }
         List<TenantDTO> dtos = tenants.stream().filter(
                 tenant -> filterByDept(tenant, tenantDeptMap, deptId, deptMap)
         ).map(tenant -> appendDeptInfo(tenant, tenantDeptMap)).collect(Collectors.toList());