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 a1bd665..6c2b464 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
@@ -394,7 +394,17 @@
         page.setSearchCount(false);
         page.setCurrent(1);
         page.setSize(Integer.MAX_VALUE);
+
+        //查询数据权限 使用默认DEPTID字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> roleTipes = permissionService.getCurrLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsibleDept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
         List<BatchExportDataDto> list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords);
         List<Dict> bfztList = permissionService.findInDictByCode("bfzt");
         List<Dict> wellTypeList = permissionService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);

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 a1bd665..6c2b464 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
@@ -394,7 +394,17 @@
         page.setSearchCount(false);
         page.setCurrent(1);
         page.setSize(Integer.MAX_VALUE);
+
+        //查询数据权限 使用默认DEPTID字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> roleTipes = permissionService.getCurrLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsibleDept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
         List<BatchExportDataDto> list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords);
         List<Dict> bfztList = permissionService.findInDictByCode("bfzt");
         List<Dict> wellTypeList = permissionService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
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 cc31d9b..a4a2fdd 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
@@ -291,7 +291,8 @@
         WHERE w.VALID='1'
         AND dw.VALID='1'
         <if test="keywords != null and keywords !=''">
-            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+            and (w.WELL_CODE like <include refid="keywords_sql"/>
+            or w.POSITION like <include refid="keywords_sql"/> )
         </if>
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}

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 a1bd665..6c2b464 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
@@ -394,7 +394,17 @@
         page.setSearchCount(false);
         page.setCurrent(1);
         page.setSize(Integer.MAX_VALUE);
+
+        //查询数据权限 使用默认DEPTID字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<String> roleTipes = permissionService.getCurrLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsibleDept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
         List<BatchExportDataDto> list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords);
         List<Dict> bfztList = permissionService.findInDictByCode("bfzt");
         List<Dict> wellTypeList = permissionService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);
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 cc31d9b..a4a2fdd 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
@@ -291,7 +291,8 @@
         WHERE w.VALID='1'
         AND dw.VALID='1'
         <if test="keywords != null and keywords !=''">
-            AND w.WELL_CODE LIKE CONCAT('%',#{keywords},'%')
+            and (w.WELL_CODE like <include refid="keywords_sql"/>
+            or w.POSITION like <include refid="keywords_sql"/> )
         </if>
         <if test="wellType != null and wellType !=''">
             and w.WELL_TYPE = #{wellType}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index cdef423..767181e 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -322,7 +322,7 @@
     @Override
     public List<BatchExportDataDto> getBatchExportData(DataScope dataScope, Page<BatchExportDataDto> page, String deviceType, String deptid, String keywords) {
         List<Long> deptIds = new ArrayList<>();
-        if (!deptid.isEmpty()) {
+        if (ToolUtil.isNotEmpty(deptid)) {
             deptIds = service.getSubDepts(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }