diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java
index bae286c1..9225993e 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java
@@ -14,6 +14,5 @@ public interface Zfztjdm111915Mapper {
      */
     List<Zfztjdm111915> selectZfztjdmList(Zfztjdm111915 zfztjdm111915);
     List<Zfztjdm111915> selectZfztjdmListAndDept(String subName);
-    List<Zfztjdm111915> selectZfztjdmListAndDeptQX(Zfztjdm111915 zfztjdm111915);
     Zfztjdm111915 selectZfztjdmAndDeptByCode(String code);
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java
index aa6dc253..a7adda8b 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java
@@ -37,7 +37,6 @@ public interface IZfryjdm2405301Service
     List<Zfryjdm2405301> selectZfryjdmList2(Zfryjdm2405301 zfryjdm2405301);
     List<Zfryjdm2405301> selectZfryjdmAndUserListGroupBy(Zfryjdm2405301 zfryjdm2405301);
 
-    List<Zfryjdm2405301> selectZfryjdmAndUserListGroupByQX(Zfryjdm2405301 zfryjdm2405301);
 
     List<Zfryjdm2405301> selectZfryjdmByDeptId(Zfryjdm2405301 zfryjdm2405301);
 
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java
index 4f3019ab..d548474a 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java
@@ -9,8 +9,6 @@ public interface IZfztjdm111915Service {
     List<Zfztjdm111915>selectZfztjdmList(Zfztjdm111915 zfztjdm111915);
     List<Zfztjdm111915> selectZfztjdmListAndDept(String subName);
 
-    List<Zfztjdm111915> selectZfztjdmListAndDeptQX(Zfztjdm111915 zfztjdm111915);
-
     List<Zfztjdm111915> getDeptStaticList(Zfryjdm2405301 zfryjdm2405301);
 
     int getZFRYNumber(Zfryjdm2405301 zfryjdm2405301);
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java
index 573dbce0..fe7c0135 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java
@@ -48,11 +48,6 @@ public class Zfryjdm2405301ServiceImpl implements IZfryjdm2405301Service
     public List<Zfryjdm2405301> selectZfryjdmAndUserListGroupBy(Zfryjdm2405301 zfryjdm2405301) {
         return zfryjdm2405301Mapper.selectZfryjdmAndUserListGroupBy(zfryjdm2405301);
     }
-    @Override
-    @DataScope(deptAlias = "x")
-    public List<Zfryjdm2405301> selectZfryjdmAndUserListGroupByQX(Zfryjdm2405301 zfryjdm2405301) {
-        return zfryjdm2405301Mapper.selectZfryjdmAndUserListGroupBy(zfryjdm2405301);
-    }
 
     @Override
     public List<Zfryjdm2405301> selectZfryjdmByDeptId(Zfryjdm2405301 zfryjdm2405301){
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java
index 0399b5f6..05ae0bca 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java
@@ -31,21 +31,14 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
         return zfztjdm111915Mapper.selectZfztjdmListAndDept(subName);
     }
 
-    @Override
-    @DataScope(deptAlias = "d")
-    public List<Zfztjdm111915> selectZfztjdmListAndDeptQX(Zfztjdm111915 zfztjdm111915) {
-        return zfztjdm111915Mapper.selectZfztjdmListAndDeptQX(zfztjdm111915);
-    }
 
     @Override
     public List<Zfztjdm111915> getDeptStaticList(Zfryjdm2405301 zfryjdm2405301) {
 //        int totalNumber=0;
-        Zfztjdm111915 zfztjdm111915=new Zfztjdm111915();
-        zfztjdm111915.setSubName(zfryjdm2405301.getZfdw());
-        List<Zfztjdm111915> zfztjdm111915List = this.selectZfztjdmListAndDeptQX(zfztjdm111915);
+        List<Zfztjdm111915> zfztjdm111915List = this.selectZfztjdmListAndDept(zfryjdm2405301.getZfdw());
 //        Map<String,Zfztjdm111915> zfztjdm111915Map=zfztjdm111915List.stream().collect(Collectors.toMap(Zfztjdm111915::getCode, Function.identity()));
         List<Zfztjdm111915> hasList=new ArrayList<>();
-        List<Zfryjdm2405301> zfryjdm2405301List = iZfryjdm2405301Service.selectZfryjdmAndUserListGroupByQX(zfryjdm2405301);
+        List<Zfryjdm2405301> zfryjdm2405301List = iZfryjdm2405301Service.selectZfryjdmAndUserListGroupBy(zfryjdm2405301);
         for (int i = 0; i < zfztjdm111915List.size(); i++) {
             int j=i;
             List<Zfryjdm2405301> ancestorList=zfryjdm2405301List.stream().filter(item->ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
index 3a31830d..95e76b11 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
@@ -73,12 +73,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by z.sfzcode_encrypt)x
         left join (select dept_id,ancestors,creditcode from sys_dept where status='0' and del_flag='0') d
         on x.dept_id=d.dept_id
-        <where>
-            <if test="params.dataScope != null and params.dataScope != ''">
-                <!-- 数据范围过滤 -->
-                ${params.dataScope}
-            </if>
-        </where>
         order by zzjgdm
     </select>
 
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
index eb353388..6162eebe 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
@@ -35,20 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         group by t.code
     </select>
-    <select id="selectZfztjdmListAndDeptQX" parameterType="Zfztjdm111915" resultMap="Zfztjdm111915Result">
-        select t.sub_name,t.code,d.dept_id as deptId,d.ancestors  from zfztjdm111915 t
-        left join
-        (select dept_id,ancestors,creditcode from sys_dept where status='0' and del_flag='0' and creditcode is not null) d
-        on t.code=d.creditcode
-        <where>
-            <if test="subName!=null and subName!=''">and sub_name like concat('%',#{subName},'%')</if>
-            <if test="params.dataScope != null and params.dataScope != ''">
-                <!-- 数据范围过滤 -->
-                ${params.dataScope}
-            </if>
-        </where>
-        group by t.code
-    </select>
     <select id="selectZfztjdmAndDeptByCode" parameterType="String" resultMap="Zfztjdm111915Result">
         select t.sub_name,t.code,d.dept_id as deptId,d.ancestors  from zfztjdm111915 t
         left join