diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java
index 2efd3ce5..8bae1dbe 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java
@@ -1,6 +1,7 @@
 package com.zdxt.code.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.zdxt.common.BaseDomain;
 
 /**
  * 双系统
@@ -9,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  * @date 2024-04-12
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Zfryjdm2405301 {
+public class Zfryjdm2405301 extends BaseDomain {
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java
index b16c61c2..8a9b3e59 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java
@@ -1,10 +1,13 @@
 package com.zdxt.code.domain;
 
+import com.zdxt.common.BaseDomain;
+
+import java.util.Date;
 import java.util.List;
 
-public class Zfztjdm111915 {
+public class Zfztjdm111915 extends BaseDomain {
     private String id;
-    private String updateTime;
+    private Date updateTime;
     private String updateStatus;
     private String SEQ;
     private String INS;
@@ -24,11 +27,11 @@ public class Zfztjdm111915 {
         this.id = id;
     }
 
-    public String getUpdateTime() {
+    public Date getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(String updateTime) {
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
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 9225993e..bae286c1 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,5 +14,6 @@ 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 fe4ea2fd..aa6dc253 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,6 +37,8 @@ public interface IZfryjdm2405301Service
     List<Zfryjdm2405301> selectZfryjdmList2(Zfryjdm2405301 zfryjdm2405301);
     List<Zfryjdm2405301> selectZfryjdmAndUserListGroupBy(Zfryjdm2405301 zfryjdm2405301);
 
+    List<Zfryjdm2405301> selectZfryjdmAndUserListGroupByQX(Zfryjdm2405301 zfryjdm2405301);
+
     List<Zfryjdm2405301> selectZfryjdmByDeptId(Zfryjdm2405301 zfryjdm2405301);
 
     List<Zfryjdm2405301> getZfryjdmListByCode(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 d548474a..4f3019ab 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,6 +9,8 @@ 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 91158495..573dbce0 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
@@ -5,6 +5,7 @@ import com.zdxt.code.domain.Zfztjdm111915;
 import com.zdxt.code.mapper.Zfryjdm2405301Mapper;
 import com.zdxt.code.service.IZfryjdm2405301Service;
 import com.zdxt.code.service.IZfztjdm111915Service;
+import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.IdCardCryptoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +48,11 @@ 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 eebee45e..0399b5f6 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
@@ -5,6 +5,7 @@ import com.zdxt.code.domain.Zfztjdm111915;
 import com.zdxt.code.mapper.Zfztjdm111915Mapper;
 import com.zdxt.code.service.IZfryjdm2405301Service;
 import com.zdxt.code.service.IZfztjdm111915Service;
+import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.IdCardCryptoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,13 +31,21 @@ 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;
-        List<Zfztjdm111915> zfztjdm111915List = this.selectZfztjdmListAndDept(zfryjdm2405301.getZfdw());
+        Zfztjdm111915 zfztjdm111915=new Zfztjdm111915();
+        zfztjdm111915.setSubName(zfryjdm2405301.getZfdw());
+        List<Zfztjdm111915> zfztjdm111915List = this.selectZfztjdmListAndDeptQX(zfztjdm111915);
 //        Map<String,Zfztjdm111915> zfztjdm111915Map=zfztjdm111915List.stream().collect(Collectors.toMap(Zfztjdm111915::getCode, Function.identity()));
         List<Zfztjdm111915> hasList=new ArrayList<>();
-        List<Zfryjdm2405301> zfryjdm2405301List = iZfryjdm2405301Service.selectZfryjdmAndUserListGroupBy(zfryjdm2405301);
+        List<Zfryjdm2405301> zfryjdm2405301List = iZfryjdm2405301Service.selectZfryjdmAndUserListGroupByQX(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 95e76b11..3a31830d 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
@@ -73,6 +73,12 @@ 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 6162eebe..eb353388 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
@@ -35,6 +35,20 @@ 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