diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index be99021..715c5ef 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -301,7 +301,7 @@
 //            batchExportDataDto.setDeviceCount(busWellInfoService.getDeviceCountData(batchExportDataDto.getId()));
 //            batchExportDataDto.setDeptName(busWellInfoService.getDeptNameData(batchExportDataDto.getDeptId()));
             batchExportDataDto.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType()));
-            batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(batchExportDataDto.getDeptId()));
+            batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(Long.valueOf(batchExportDataDto.getDeptId())));
 
         });
         //获取导出文件header

diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index be99021..715c5ef 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -301,7 +301,7 @@
 //            batchExportDataDto.setDeviceCount(busWellInfoService.getDeviceCountData(batchExportDataDto.getId()));
 //            batchExportDataDto.setDeptName(busWellInfoService.getDeptNameData(batchExportDataDto.getDeptId()));
             batchExportDataDto.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType()));
-            batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(batchExportDataDto.getDeptId()));
+            batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(Long.valueOf(batchExportDataDto.getDeptId())));
 
         });
         //获取导出文件header
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index ee3e181..386c56e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -144,7 +144,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT w.WELL_CODE AS "wellCode", w.WELL_NAME AS "wellName", w.deep,
         w.WELL_TYPE AS "wellType",w.deptid AS "deptId",
-        w.bfzt, w.position,w.id, IFNULL(deviceCount,0) AS "deviceCount"
+        w.bfzt, w.position,w.id, COALESCE(deviceCount,0) AS "deviceCount"
         FROM bus_well_info w
         LEFT JOIN
         (SELECT COUNT(1) AS deviceCount ,well_id