diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
index 44d1029..8fa6f08 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
@@ -14,11 +14,11 @@
 public interface ThirdPartyDataMapper {
 
     List<GasDectorDataDto> getGasDectorListPage(@Param("page") Page<GasDectorDataDto> page, @Param("dataScope") DataScope dataScope,
-                                                @Param("deptid") String deptid, @Param("endTime") String endTime,
+                                                @Param("deptid") Long deptid, @Param("endTime") String endTime,
                                                 @Param("beginTime") String beginTime, @Param("keywords") String keyWords);
 
     List<PantiltDataDto> getPantiltDataListPage(@Param("page") Page<PantiltDataDto> page, @Param("dataScope") DataScope dataScope,
-                                                @Param("deptid") String deptid, @Param("endTime") String endTime,
+                                                @Param("deptid") Long deptid, @Param("endTime") String endTime,
                                                 @Param("beginTime") String beginTime, @Param("keywords") String keyWords);
 
     Map<String,Object> countRecordsByTime(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime,

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
index 44d1029..8fa6f08 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
@@ -14,11 +14,11 @@
 public interface ThirdPartyDataMapper {
 
     List<GasDectorDataDto> getGasDectorListPage(@Param("page") Page<GasDectorDataDto> page, @Param("dataScope") DataScope dataScope,
-                                                @Param("deptid") String deptid, @Param("endTime") String endTime,
+                                                @Param("deptid") Long deptid, @Param("endTime") String endTime,
                                                 @Param("beginTime") String beginTime, @Param("keywords") String keyWords);
 
     List<PantiltDataDto> getPantiltDataListPage(@Param("page") Page<PantiltDataDto> page, @Param("dataScope") DataScope dataScope,
-                                                @Param("deptid") String deptid, @Param("endTime") String endTime,
+                                                @Param("deptid") Long deptid, @Param("endTime") String endTime,
                                                 @Param("beginTime") String beginTime, @Param("keywords") String keyWords);
 
     Map<String,Object> countRecordsByTime(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 21242a6..283fc66 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -56,7 +56,7 @@
         INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
         WHERE bd.DEVCODE=dgd.DEVCODE
 
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and  deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -97,7 +97,7 @@
         INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
         INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
         WHERE bd.DEVCODE=dp.DEVCODE
-        <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/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
index 44d1029..8fa6f08 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java
@@ -14,11 +14,11 @@
 public interface ThirdPartyDataMapper {
 
     List<GasDectorDataDto> getGasDectorListPage(@Param("page") Page<GasDectorDataDto> page, @Param("dataScope") DataScope dataScope,
-                                                @Param("deptid") String deptid, @Param("endTime") String endTime,
+                                                @Param("deptid") Long deptid, @Param("endTime") String endTime,
                                                 @Param("beginTime") String beginTime, @Param("keywords") String keyWords);
 
     List<PantiltDataDto> getPantiltDataListPage(@Param("page") Page<PantiltDataDto> page, @Param("dataScope") DataScope dataScope,
-                                                @Param("deptid") String deptid, @Param("endTime") String endTime,
+                                                @Param("deptid") Long deptid, @Param("endTime") String endTime,
                                                 @Param("beginTime") String beginTime, @Param("keywords") String keyWords);
 
     Map<String,Object> countRecordsByTime(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 21242a6..283fc66 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -56,7 +56,7 @@
         INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
         WHERE bd.DEVCODE=dgd.DEVCODE
 
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and  deptid != -1 ">
             and bwi.DEPTID = #{deptid}
         </if>
         <if test="beginTime != null and beginTime != '' ">
@@ -97,7 +97,7 @@
         INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
         INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
         WHERE bd.DEVCODE=dp.DEVCODE
-        <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/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
index 7870e5b..e01f8ce 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -34,7 +35,7 @@
                                              String deptid, String endTime, String beginTime, String keyWords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<GasDectorDataDto> gasDectorDataDtoList = thirdPartyMapper.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
+            List<GasDectorDataDto> gasDectorDataDtoList = thirdPartyMapper.getGasDectorListPage(page, dataScope,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), endTime, beginTime, keyWords);
             gasDectorDataDtoList.forEach(gasDectorDataDto -> {
                 gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
             });
@@ -55,7 +56,7 @@
                                                String deptid, String endTime, String beginTime, String keyWords) {
         ResponseData responseData = new ResponseData();
         try {
-            List<PantiltDataDto> pantiltDtoList = thirdPartyMapper.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
+            List<PantiltDataDto> pantiltDtoList = thirdPartyMapper.getPantiltDataListPage(page, dataScope,  StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid), endTime, beginTime, keyWords);
             page.setRecords(pantiltDtoList);
             responseData.setData(page);
             responseData.setMessage("查询成功");