diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4235d85..d4b308e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -112,7 +112,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
@@ -130,7 +130,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
@@ -276,7 +276,7 @@
         DEVICETYPENAME
         FROM liquid_view
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -678,7 +678,7 @@
         deviceTypeName
         FROM wellcover_monitorview
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid !=-1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -730,7 +730,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -784,7 +784,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <choose>
@@ -845,7 +845,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -898,7 +898,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -953,7 +953,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1007,7 +1007,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1061,7 +1061,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1113,7 +1113,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1185,7 +1185,7 @@
         ) SA ON SA.DEPTID = SD.ID
         <where>
             AND SD.dept_type = '03'
-            <if test="deptId != null">
+            <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
                         and SD.ID = #{deptId}
@@ -1272,7 +1272,7 @@
             <include refid="keywords_sql"/>
             OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -1313,7 +1313,7 @@
         LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4235d85..d4b308e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -112,7 +112,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
@@ -130,7 +130,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
@@ -276,7 +276,7 @@
         DEVICETYPENAME
         FROM liquid_view
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -678,7 +678,7 @@
         deviceTypeName
         FROM wellcover_monitorview
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid !=-1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -730,7 +730,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -784,7 +784,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <choose>
@@ -845,7 +845,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -898,7 +898,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -953,7 +953,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1007,7 +1007,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1061,7 +1061,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1113,7 +1113,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1185,7 +1185,7 @@
         ) SA ON SA.DEPTID = SD.ID
         <where>
             AND SD.dept_type = '03'
-            <if test="deptId != null">
+            <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
                         and SD.ID = #{deptId}
@@ -1272,7 +1272,7 @@
             <include refid="keywords_sql"/>
             OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -1313,7 +1313,7 @@
         LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 5b03b61..bb28cfc 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
@@ -400,60 +400,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -542,7 +542,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -562,7 +562,7 @@
     public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid);
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
             h2sDataDtoList.forEach(
                     h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4235d85..d4b308e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -112,7 +112,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
@@ -130,7 +130,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
@@ -276,7 +276,7 @@
         DEVICETYPENAME
         FROM liquid_view
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -678,7 +678,7 @@
         deviceTypeName
         FROM wellcover_monitorview
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid !=-1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -730,7 +730,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -784,7 +784,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <choose>
@@ -845,7 +845,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -898,7 +898,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -953,7 +953,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1007,7 +1007,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1061,7 +1061,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1113,7 +1113,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1185,7 +1185,7 @@
         ) SA ON SA.DEPTID = SD.ID
         <where>
             AND SD.dept_type = '03'
-            <if test="deptId != null">
+            <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
                         and SD.ID = #{deptId}
@@ -1272,7 +1272,7 @@
             <include refid="keywords_sql"/>
             OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -1313,7 +1313,7 @@
         LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 5b03b61..bb28cfc 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
@@ -400,60 +400,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -542,7 +542,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -562,7 +562,7 @@
     public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid);
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
             h2sDataDtoList.forEach(
                     h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 718f84f..5178f9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -33,7 +33,7 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
     List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
-                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") Integer deviceType);
 
     /**
      * 查询设备信息

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4235d85..d4b308e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -112,7 +112,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
@@ -130,7 +130,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
@@ -276,7 +276,7 @@
         DEVICETYPENAME
         FROM liquid_view
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -678,7 +678,7 @@
         deviceTypeName
         FROM wellcover_monitorview
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid !=-1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -730,7 +730,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -784,7 +784,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <choose>
@@ -845,7 +845,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -898,7 +898,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -953,7 +953,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1007,7 +1007,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1061,7 +1061,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1113,7 +1113,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1185,7 +1185,7 @@
         ) SA ON SA.DEPTID = SD.ID
         <where>
             AND SD.dept_type = '03'
-            <if test="deptId != null">
+            <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
                         and SD.ID = #{deptId}
@@ -1272,7 +1272,7 @@
             <include refid="keywords_sql"/>
             OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -1313,7 +1313,7 @@
         LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 5b03b61..bb28cfc 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
@@ -400,60 +400,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -542,7 +542,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -562,7 +562,7 @@
     public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid);
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
             h2sDataDtoList.forEach(
                     h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 718f84f..5178f9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -33,7 +33,7 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
     List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
-                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") Integer deviceType);
 
     /**
      * 查询设备信息
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 07761de..eac1293 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
@@ -280,8 +280,8 @@
         <if test="deviceCode != null and deviceCode !=''">
             AND  bd.DEVCODE = #{deviceCode}
         </if>
-        <if test="deviceType != null and deviceType !=''">
-            AND  bd.deviceType = #{deviceType}
+        <if test="deviceType != null and deviceType != -1">
+            AND  bd.device_type = #{deviceType}
         </if>
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4235d85..d4b308e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -112,7 +112,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
@@ -130,7 +130,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
@@ -276,7 +276,7 @@
         DEVICETYPENAME
         FROM liquid_view
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -678,7 +678,7 @@
         deviceTypeName
         FROM wellcover_monitorview
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid !=-1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -730,7 +730,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -784,7 +784,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <choose>
@@ -845,7 +845,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -898,7 +898,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -953,7 +953,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1007,7 +1007,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1061,7 +1061,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1113,7 +1113,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1185,7 +1185,7 @@
         ) SA ON SA.DEPTID = SD.ID
         <where>
             AND SD.dept_type = '03'
-            <if test="deptId != null">
+            <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
                         and SD.ID = #{deptId}
@@ -1272,7 +1272,7 @@
             <include refid="keywords_sql"/>
             OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -1313,7 +1313,7 @@
         LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 5b03b61..bb28cfc 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
@@ -400,60 +400,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -542,7 +542,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -562,7 +562,7 @@
     public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid);
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
             h2sDataDtoList.forEach(
                     h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 718f84f..5178f9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -33,7 +33,7 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
     List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
-                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") Integer deviceType);
 
     /**
      * 查询设备信息
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 07761de..eac1293 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
@@ -280,8 +280,8 @@
         <if test="deviceCode != null and deviceCode !=''">
             AND  bd.DEVCODE = #{deviceCode}
         </if>
-        <if test="deviceType != null and deviceType !=''">
-            AND  bd.deviceType = #{deviceType}
+        <if test="deviceType != null and deviceType != -1">
+            AND  bd.device_type = #{deviceType}
         </if>
     </select>
 
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 99db8fc..2d33cea 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
@@ -347,7 +347,7 @@
                                         String deviceCode, String deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, deviceType);
+            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
             page.setRecords(offlineList);
             responseData.setCode(200);
             responseData.setMessage("查询成功");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4235d85..d4b308e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -112,7 +112,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
@@ -130,7 +130,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
@@ -276,7 +276,7 @@
         DEVICETYPENAME
         FROM liquid_view
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -678,7 +678,7 @@
         deviceTypeName
         FROM wellcover_monitorview
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid !=-1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -730,7 +730,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -784,7 +784,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <choose>
@@ -845,7 +845,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -898,7 +898,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -953,7 +953,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1007,7 +1007,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1061,7 +1061,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1113,7 +1113,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1185,7 +1185,7 @@
         ) SA ON SA.DEPTID = SD.ID
         <where>
             AND SD.dept_type = '03'
-            <if test="deptId != null">
+            <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
                         and SD.ID = #{deptId}
@@ -1272,7 +1272,7 @@
             <include refid="keywords_sql"/>
             OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -1313,7 +1313,7 @@
         LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 5b03b61..bb28cfc 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
@@ -400,60 +400,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -542,7 +542,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -562,7 +562,7 @@
     public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid);
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
             h2sDataDtoList.forEach(
                     h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 718f84f..5178f9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -33,7 +33,7 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
     List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
-                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") Integer deviceType);
 
     /**
      * 查询设备信息
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 07761de..eac1293 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
@@ -280,8 +280,8 @@
         <if test="deviceCode != null and deviceCode !=''">
             AND  bd.DEVCODE = #{deviceCode}
         </if>
-        <if test="deviceType != null and deviceType !=''">
-            AND  bd.deviceType = #{deviceType}
+        <if test="deviceType != null and deviceType != -1">
+            AND  bd.device_type = #{deviceType}
         </if>
     </select>
 
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 99db8fc..2d33cea 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
@@ -347,7 +347,7 @@
                                         String deviceCode, String deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, deviceType);
+            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
             page.setRecords(offlineList);
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f62fc00..f2de9cc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -35,24 +35,20 @@
      */
     @ExcelProperty("设备编号")
     private String devcode;
-    @ExcelProperty("设备类型")
     private Long deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门Id")
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
     @ExcelProperty("井盖编号")
     private String wellCode;
-    @ExcelProperty("状态描述")
     private String descn;
-    @ExcelProperty("状态")
+    @ExcelProperty("采集时间")
     private String uptime;
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
     private String strength;
-    @ExcelProperty("日志时间")
     private String logtime;
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4235d85..d4b308e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -112,7 +112,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
@@ -130,7 +130,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
@@ -276,7 +276,7 @@
         DEVICETYPENAME
         FROM liquid_view
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -678,7 +678,7 @@
         deviceTypeName
         FROM wellcover_monitorview
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid !=-1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -730,7 +730,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -784,7 +784,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <choose>
@@ -845,7 +845,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -898,7 +898,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -953,7 +953,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1007,7 +1007,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1061,7 +1061,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1113,7 +1113,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1185,7 +1185,7 @@
         ) SA ON SA.DEPTID = SD.ID
         <where>
             AND SD.dept_type = '03'
-            <if test="deptId != null">
+            <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
                         and SD.ID = #{deptId}
@@ -1272,7 +1272,7 @@
             <include refid="keywords_sql"/>
             OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -1313,7 +1313,7 @@
         LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 5b03b61..bb28cfc 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
@@ -400,60 +400,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -542,7 +542,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -562,7 +562,7 @@
     public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid);
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
             h2sDataDtoList.forEach(
                     h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 718f84f..5178f9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -33,7 +33,7 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
     List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
-                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") Integer deviceType);
 
     /**
      * 查询设备信息
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 07761de..eac1293 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
@@ -280,8 +280,8 @@
         <if test="deviceCode != null and deviceCode !=''">
             AND  bd.DEVCODE = #{deviceCode}
         </if>
-        <if test="deviceType != null and deviceType !=''">
-            AND  bd.deviceType = #{deviceType}
+        <if test="deviceType != null and deviceType != -1">
+            AND  bd.device_type = #{deviceType}
         </if>
     </select>
 
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 99db8fc..2d33cea 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
@@ -347,7 +347,7 @@
                                         String deviceCode, String deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, deviceType);
+            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
             page.setRecords(offlineList);
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f62fc00..f2de9cc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -35,24 +35,20 @@
      */
     @ExcelProperty("设备编号")
     private String devcode;
-    @ExcelProperty("设备类型")
     private Long deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门Id")
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
     @ExcelProperty("井盖编号")
     private String wellCode;
-    @ExcelProperty("状态描述")
     private String descn;
-    @ExcelProperty("状态")
+    @ExcelProperty("采集时间")
     private String uptime;
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
     private String strength;
-    @ExcelProperty("日志时间")
     private String logtime;
 }
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
index 4dc3b0b..34f4ffd 100644
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ b/casic-web/src/main/resources/config/application-postgre.yml
@@ -1,5 +1,5 @@
 server:
-  port: 11309
+  port: 11308
 ###################  spring配置  ###################
 spring:
   datasource:

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 4885ee4..e78364f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
+        return this.baseMapper.getAlarmContent(StrUtil.isEmpty(alarmType)?-1:Long.valueOf(alarmType),StrUtil.isEmpty(devType)?-1:Long.valueOf(devType));
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 6feea91..5bbe873 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -70,7 +70,7 @@
         FROM base_alarm_content_type
         WHERE 1=1
         <if test="alarmType!=null and alarmType!=-1">
-            AND alarm_type = #{alarmType}]
+            AND alarm_type = #{alarmType}
         </if>
         <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 67fb9c9..3529f70 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -22,9 +22,9 @@
  */
 public interface DataAnalysisMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
-    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
+    List<BusWellInfoDto> getNotAlarmWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") Long deptid);
 
     DeviceData wellcoverData(@Param("devcode") String devcode);
 
@@ -60,25 +60,25 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
 
@@ -94,9 +94,9 @@
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
+    List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") Long deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<H2SDataDto> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<H2SDataDto>  page, @Param("keywords") String keywords,
-                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid);
+                             @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 4235d85..d4b308e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -112,7 +112,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE in (SELECT DISTINCT well_code from alarm_records where status = '1')
@@ -130,7 +130,7 @@
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and w.DEPTID = #{deptid}
         </if>
         AND w.VALID='1' and w.WELL_CODE not in (SELECT DISTINCT WELL_CODE from alarm_records where status = '1')
@@ -276,7 +276,7 @@
         DEVICETYPENAME
         FROM liquid_view
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -678,7 +678,7 @@
         deviceTypeName
         FROM wellcover_monitorview
         <where>
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid !=-1 ">
                 and deptid = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -730,7 +730,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -784,7 +784,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <choose>
@@ -845,7 +845,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -898,7 +898,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -953,7 +953,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1007,7 +1007,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1061,7 +1061,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1113,7 +1113,7 @@
         INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
@@ -1185,7 +1185,7 @@
         ) SA ON SA.DEPTID = SD.ID
         <where>
             AND SD.dept_type = '03'
-            <if test="deptId != null">
+            <if test="deptid != -1 ">
                 <choose>
                     <when test="searchCurr">
                         and SD.ID = #{deptId}
@@ -1272,7 +1272,7 @@
             <include refid="keywords_sql"/>
             OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -1313,7 +1313,7 @@
         LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
+            <if test="deptid != null and deptid != -1 ">
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 5b03b61..bb28cfc 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -51,12 +51,12 @@
 
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
     public List<BusWellInfoDto> getNotAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
-        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
+        return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
     }
 
     @Override
@@ -400,60 +400,60 @@
     //数据相关统计------------------------------------------------------------
     @Override
     public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectWellDataScopePage(dataScope, page, StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return this.baseMapper.selectLiquidDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
     @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
     }
 
     @Override
     public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
     public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
     public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -542,7 +542,7 @@
     public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), beginTime, endTime, keywords);
             hydrantDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -562,7 +562,7 @@
     public ResponseData getH2slist(DataScope dataScope, Page<H2SDataDto> page, String keywords, String beginTime, String endTime, String deptid){
         ResponseData responseData = new ResponseData();
         try {
-            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid);
+            List<H2SDataDto> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
             h2sDataDtoList.forEach(
                     h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid()))
             );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 718f84f..5178f9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -33,7 +33,7 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
 
     List<Map<String, Object>> offlineListPage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,
-                                              @Param("deviceCode") String deviceCode, @Param("deviceType") String deviceType);
+                                              @Param("deviceCode") String deviceCode, @Param("deviceType") Integer deviceType);
 
     /**
      * 查询设备信息
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 07761de..eac1293 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
@@ -280,8 +280,8 @@
         <if test="deviceCode != null and deviceCode !=''">
             AND  bd.DEVCODE = #{deviceCode}
         </if>
-        <if test="deviceType != null and deviceType !=''">
-            AND  bd.deviceType = #{deviceType}
+        <if test="deviceType != null and deviceType != -1">
+            AND  bd.device_type = #{deviceType}
         </if>
     </select>
 
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 99db8fc..2d33cea 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
@@ -347,7 +347,7 @@
                                         String deviceCode, String deviceType) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, deviceType);
+            List<Map<String, Object>> offlineList = this.baseMapper.offlineListPage(dataScope, page, deviceCode, StrUtil.isEmptyOrUndefined(deviceType) ? -1 : Integer.valueOf(deviceType));
             page.setRecords(offlineList);
             responseData.setCode(200);
             responseData.setMessage("查询成功");
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index f62fc00..f2de9cc 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -35,24 +35,20 @@
      */
     @ExcelProperty("设备编号")
     private String devcode;
-    @ExcelProperty("设备类型")
     private Long deviceType;
     @ExcelProperty("设备类型名称")
     private String deviceTypeName;
-    @ExcelProperty("部门Id")
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
     @ExcelProperty("井盖编号")
     private String wellCode;
-    @ExcelProperty("状态描述")
     private String descn;
-    @ExcelProperty("状态")
+    @ExcelProperty("采集时间")
     private String uptime;
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
     private String strength;
-    @ExcelProperty("日志时间")
     private String logtime;
 }
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
index 4dc3b0b..34f4ffd 100644
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ b/casic-web/src/main/resources/config/application-postgre.yml
@@ -1,5 +1,5 @@
 server:
-  port: 11309
+  port: 11308
 ###################  spring配置  ###################
 spring:
   datasource:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 880d26f..ce704d7 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: dev
+    active: postgre
   servlet:
     multipart:
       max-file-size: 50MB