diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
index 8b3f85b2..42cd5644 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
@@ -29,6 +29,7 @@
                             <a class="btn btn-success btn-sm" onclick="deptSearch()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-reset btn-sm" onclick="deptRest()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             <a class="btn btn-warning btn-sm" onclick="downloadD()"><i class="fa fa-share-square-o"></i> 导出</a>
+                            <a class="btn btn-info btn-sm" id="closeButton" onclick="closeD()"><i class="fa fa-reply"></i> 返回</a>
                         </li>
                     </ul>
                     <!--<ul>
@@ -49,6 +50,7 @@
             </form>
         </div>
         <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table-details" ></table>
             <table id="bootstrap-table"></table>
         </div>
     </div>
@@ -56,20 +58,21 @@
 <th:block th:include="zdxtInclude :: footer" />
 <script th:inline="javascript">
     var prefix = ctx + "code/deptStatic";
+    window.onload = function () {
+        rTable();
+        closeD();
+    }
     $(function() {
         var options = {
-            url: prefix + "/list",
-            createUrl: prefix + "/add",
-            updateUrl: prefix + "/edit/{id}",
-            removeUrl: prefix + "/remove",
-            detailUrl: prefix + "/detail/{id}",
-            exportUrl: prefix + "/export",
             modalName: "执法部门统计",
-            showHeader: false,
+            showHeader: true,
             showFooter: false,
             showColumns: false,
             showRefresh: false,
             showToggle: false,
+            pagination: true,
+            pageSize: 10,
+            pageList: [10, 25, 50],
             //quarterBoolean:quarterBoolean,
             columns: [
                 /*{
@@ -80,7 +83,7 @@
                     title : '主键ID',
                     visible: false
                 },*/
-                {
+                /*{
                     field : 'zfdw',
                     title : '部门名称',
                 },
@@ -96,13 +99,51 @@
                     field : 'phoneNumber',
                     title : '联系方式'
 
-                }
+                }*/
+                {
+                    field : 'subName',
+                    title : '部门名称',
+                },
+                {
+                    field : 'number',
+                    title : '执法人员数量',
+                },
+                {
+                    title : '详情',
+                    formatter:function (value,row,index) {
+                        if(row.number == 0){
+                            return "<span>详情</span>";
+                        }else{
+                            /*return "<span>是</span>";*/
+                            return '<span style="cursor: pointer;color: blue;" ONCLICK="openDetails(\'' + row.code + '\')">'+'详情'+'</span>';
+                        }
+                    }
+
+                },
             ]
         };
-        $.table.init(options);
+        $("#bootstrap-table").bootstrapTable(options);
     });
+
+    function rTable(){
+        var currentId=$('form').eq(0).attr('id');
+        var params = $.common.formToJSON(currentId);
+        $.ajax({
+            url: prefix + "/list",
+            method: 'post',
+            data:params,
+            success:function (response){
+                $('#bootstrap-table').bootstrapTable('load', response);
+                data1=response;
+                console.log(data1);
+            },error:function (xhr,status,error){
+                console.error("请求失败：",status,error);
+            }
+        })
+    }
     function deptSearch(){
-        $.table.search();
+        rTable();
+        closeD();
         var currentId=$('form').eq(0).attr('id');
         var params = $.common.formToJSON(currentId);
         $.ajax({
@@ -114,6 +155,75 @@
             }
         })
     }
+    function openDetails(code){
+        var currentId=$('form').eq(0).attr('id');
+        var params = $.common.formToJSON(currentId);
+        console.log(params)
+        $.ajax({
+            url:prefix+'/getZfryjdmListByCode',
+            type:'POST',
+            data: {
+                code:code,
+                name:params.name,
+                zfcode:params.zfcode,
+                zfdw:params.zfdw
+            },
+            success:function (response){
+                var options = {
+                    modalName: "执法部门统计",
+                    showHeader: true,
+                    showFooter: false,
+                    showColumns: false,
+                    showRefresh: false,
+                    showToggle: false,
+                    pagination: true,
+                    pageSize: 10,
+                    pageList: [10, 25, 50],
+                    //quarterBoolean:quarterBoolean,
+                    columns: [
+                        /*{
+                        checkbox: false
+                        },*/
+                        {
+                            field : 'id',
+                            title : '主键ID',
+                            visible: false
+                        },
+                        {
+                            field : 'zfdw',
+                            title : '部门名称',
+                        },
+                        {
+                            field : 'name',
+                            title : '执法人员',
+                        },
+                        {
+                            field : 'zfcode',
+                            title : '执法证号'
+                        },
+                        {
+                            field : 'phoneNumber',
+                            title : '联系方式'
+
+                        }
+                    ]
+                };
+                $("#bootstrap-table-details").bootstrapTable(options);
+                console.log(response);
+                $('#closeButton').show();
+                $('#bootstrap-table-details').show();
+                $('#bootstrap-table').hide();
+                $('#bootstrap-table-details').bootstrapTable('load', response);
+            },error:function (xhr,status,error){
+                console.error("请求失败：",status,error);
+            }
+        })
+    }
+    function closeD(){
+        $('#closeButton').hide();
+        $('#bootstrap-table-details').bootstrapTable('destroy');
+        $('#bootstrap-table').show();
+    }
     function deptRest(n){
         $('form').eq(0).trigger("reset");
         deptSearch();
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/pom.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/pom.xml
index 5d50ab76..618f3915 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/pom.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/pom.xml
@@ -48,6 +48,10 @@
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
index 1ad9bfea..a466505f 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
@@ -48,22 +48,26 @@ public class DeptStaticController extends BaseController {
     @GetMapping()
     public String registration(Model model)
     {
-        List<Zfztjdm111915> deptList=iZfztjdm111915Service.selectZfztjdmList(new Zfztjdm111915());//待权限1209
-        List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(null);//待权限1209
-        model.addAttribute("lawNumber",zfryjdm2405301List.size());
-        model.addAttribute("deptNumber",deptList.size());
+        /*List<Zfztjdm111915> deptList=iZfztjdm111915Service.selectZfztjdmList(new Zfztjdm111915());//待权限1209
+        List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(null);//待权限1209*/
+        List<Zfztjdm111915> zfztjdm111915List=iZfztjdm111915Service.getDeptStaticList(new Zfryjdm2405301());
+        model.addAttribute("lawNumber",iZfztjdm111915Service.getZFRYNumber(new Zfryjdm2405301()));
+        model.addAttribute("deptNumber",zfztjdm111915List.size());
         return prefix + "/deptStatic";
     }
     @RequiresPermissions("code:deptStatic:list")
     @GetMapping("/searchType")
     public String searchType(Zfryjdm2405301 zfryjdm2405301, Model model)
     {
-        Zfztjdm111915 zfztjdm111915=new Zfztjdm111915();
+        /*Zfztjdm111915 zfztjdm111915=new Zfztjdm111915();
         zfztjdm111915.setSubName(zfryjdm2405301.getZfdw());
         List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);//待权限1209
         List<Zfztjdm111915> deptList=iZfztjdm111915Service.selectZfztjdmList(zfztjdm111915);//待权限1209
         model.addAttribute("lawNumber",zfryjdm2405301List.size());
-        model.addAttribute("deptNumber",deptList.size());
+        model.addAttribute("deptNumber",deptList.size());*/
+        List<Zfztjdm111915> zfztjdm111915List=iZfztjdm111915Service.getDeptStaticList(zfryjdm2405301);
+        model.addAttribute("lawNumber",iZfztjdm111915Service.getZFRYNumber(zfryjdm2405301));
+        model.addAttribute("deptNumber",zfztjdm111915List.size());
         return prefix + "/fragmentB";
     }
 
@@ -72,24 +76,43 @@ public class DeptStaticController extends BaseController {
     @ResponseBody
     public TableDataInfo list(Zfryjdm2405301 zfryjdm2405301)
     {
+        /*startPage();
+        List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);//待权限1209
+        for(int i=0;i<zfryjdm2405301List.size();i++){
+            if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())&&zfryjdm2405301List.get(i).getPhoneNumber().length()>11) {
+                zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber()));
+            }
+        return getDataTable(zfryjdm2405301List);}*/
         startPage();
+        List<Zfztjdm111915> zfztjdm111915List=iZfztjdm111915Service.getDeptStaticList(zfryjdm2405301);
+        return getDataTable(zfztjdm111915List);
+    }
+    @RequiresPermissions("code:deptStatic:list")
+    @PostMapping("/getZfryjdmListByCode")
+    @ResponseBody
+    public TableDataInfo getZfryjdmListByCode(Zfryjdm2405301 zfryjdm2405301)
+    {
+        /*startPage();
         List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);//待权限1209
         for(int i=0;i<zfryjdm2405301List.size();i++){
             if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())&&zfryjdm2405301List.get(i).getPhoneNumber().length()>11) {
                 zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber()));
             }
-        }
+        return getDataTable(zfryjdm2405301List);}*/
+        startPage();
+        List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.getZfryjdmListByCode(zfryjdm2405301);
         return getDataTable(zfryjdm2405301List);
     }
     @PostMapping("/export")
     @ResponseBody
     public void exportDept(HttpServletResponse httpServletResponse, @RequestBody Zfryjdm2405301 zfryjdm2405301) throws IOException {
-        List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);//待权限1209
+        /*List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);//待权限1209
         for(int i=0;i<zfryjdm2405301List.size();i++){
             if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())&&zfryjdm2405301List.get(i).getPhoneNumber().length()>11) {
                 zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber()));
             }
-        }
+        }*/
+        List<Zfryjdm2405301> zfryjdm2405301List=iZfztjdm111915Service.export(zfryjdm2405301);
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet("部门统计");
         //设置文件名称
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 ec2b7fcc..87b410c2 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
@@ -44,6 +44,9 @@ public class Zfryjdm2405301 {
     private String zfcode;
     public String phoneNumber;
     public String ztName;
+    public String deptId;
+    private String ancestors;
+    private String code;
 
     public String getPhoneNumber() {
         return phoneNumber;
@@ -180,4 +183,28 @@ public class Zfryjdm2405301 {
     public void setZfcode(String zfcode) {
         this.zfcode = zfcode;
     }
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getAncestors() {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors) {
+        this.ancestors = ancestors;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
 }
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 8a95062e..b16c61c2 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,8 +1,7 @@
 package com.zdxt.code.domain;
 
-import lombok.Data;
+import java.util.List;
 
-@Data
 public class Zfztjdm111915 {
     private String id;
     private String updateTime;
@@ -12,4 +11,104 @@ public class Zfztjdm111915 {
     private String dataPlace;
     private String subName;
     private String code;
+    private int number;
+    private String deptId;
+    private String ancestors;
+    private List<Zfryjdm2405301> zfryjdm2405301List;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateStatus() {
+        return updateStatus;
+    }
+
+    public void setUpdateStatus(String updateStatus) {
+        this.updateStatus = updateStatus;
+    }
+
+    public String getSEQ() {
+        return SEQ;
+    }
+
+    public void setSEQ(String SEQ) {
+        this.SEQ = SEQ;
+    }
+
+    public String getINS() {
+        return INS;
+    }
+
+    public void setINS(String INS) {
+        this.INS = INS;
+    }
+
+    public String getDataPlace() {
+        return dataPlace;
+    }
+
+    public void setDataPlace(String dataPlace) {
+        this.dataPlace = dataPlace;
+    }
+
+    public String getSubName() {
+        return subName;
+    }
+
+    public void setSubName(String subName) {
+        this.subName = subName;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+
+    public void setNumber(int number) {
+        this.number = number;
+    }
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getAncestors() {
+        return ancestors;
+    }
+
+    public void setAncestors(String ancestors) {
+        this.ancestors = ancestors;
+    }
+
+    public List<Zfryjdm2405301> getZfryjdm2405301List() {
+        return zfryjdm2405301List;
+    }
+
+    public void setZfryjdm2405301List(List<Zfryjdm2405301> zfryjdm2405301List) {
+        this.zfryjdm2405301List = zfryjdm2405301List;
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java
index 95759410..e00d3845 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java
@@ -37,4 +37,7 @@ public interface Zfryjdm2405301Mapper
     List<Zfryjdm2405301> selectZfryAllList();
 
     Zfryjdm2405301 selectZfryBySfz(String sfzcode);
+
+    List<Zfryjdm2405301> selectZfryjdmAndUserListGroupBy(Zfryjdm2405301 zfryjdm2405301);
+    List<Zfryjdm2405301> selectZfryjdmByDeptId(Zfryjdm2405301 zfryjdm2405301);
 }
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 b212f2d6..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
@@ -13,4 +13,6 @@ public interface Zfztjdm111915Mapper {
      * @return 集合
      */
     List<Zfztjdm111915> selectZfztjdmList(Zfztjdm111915 zfztjdm111915);
+    List<Zfztjdm111915> selectZfztjdmListAndDept(String subName);
+    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 27ae1930..fe4ea2fd 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
@@ -35,4 +35,9 @@ public interface IZfryjdm2405301Service
     Zfryjdm2405301 selectZfryByZfCode(String zfcode);
 
     List<Zfryjdm2405301> selectZfryjdmList2(Zfryjdm2405301 zfryjdm2405301);
+    List<Zfryjdm2405301> selectZfryjdmAndUserListGroupBy(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 f6c175c4..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
@@ -1,9 +1,18 @@
 package com.zdxt.code.service;
 
+import com.zdxt.code.domain.Zfryjdm2405301;
 import com.zdxt.code.domain.Zfztjdm111915;
 
 import java.util.List;
 
 public interface IZfztjdm111915Service {
     List<Zfztjdm111915>selectZfztjdmList(Zfztjdm111915 zfztjdm111915);
+    List<Zfztjdm111915> selectZfztjdmListAndDept(String subName);
+
+    List<Zfztjdm111915> getDeptStaticList(Zfryjdm2405301 zfryjdm2405301);
+
+    int getZFRYNumber(Zfryjdm2405301 zfryjdm2405301);
+    Zfztjdm111915 selectZfztjdmAndDeptByCode(String code);
+
+    List<Zfryjdm2405301> export(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 c5db5f1a..22e5c816 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
@@ -1,9 +1,11 @@
 package com.zdxt.code.service.impl;
 
 import com.zdxt.code.domain.Zfryjdm2405301;
+import com.zdxt.code.domain.Zfztjdm111915;
 import com.zdxt.code.mapper.Zfryjdm2405301Mapper;
 import com.zdxt.code.service.IZfryjdm2405301Service;
-import com.zdxt.common.annotation.DataScope;
+import com.zdxt.code.service.IZfztjdm111915Service;
+import com.zdxt.common.util.IdCardCryptoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
@@ -18,6 +20,8 @@ import java.util.List;
 public class Zfryjdm2405301ServiceImpl implements IZfryjdm2405301Service
 {
     @Autowired private Zfryjdm2405301Mapper zfryjdm2405301Mapper;
+    @Autowired
+    private IZfztjdm111915Service iZfztjdm111915Service;
 
     @Override
     public List<Zfryjdm2405301> selectZfryjdmList(String searchValue) {
@@ -38,4 +42,27 @@ public class Zfryjdm2405301ServiceImpl implements IZfryjdm2405301Service
     public List<Zfryjdm2405301> selectZfryjdmList2(Zfryjdm2405301 zfryjdm2405301){
         return zfryjdm2405301Mapper.selectZfryjdmList2(zfryjdm2405301);
     }
+
+    @Override
+    public List<Zfryjdm2405301> selectZfryjdmAndUserListGroupBy(Zfryjdm2405301 zfryjdm2405301) {
+        return zfryjdm2405301Mapper.selectZfryjdmAndUserListGroupBy(zfryjdm2405301);
+    }
+
+    @Override
+    public List<Zfryjdm2405301> selectZfryjdmByDeptId(Zfryjdm2405301 zfryjdm2405301){
+        return zfryjdm2405301Mapper.selectZfryjdmByDeptId(zfryjdm2405301);
+    }
+    @Override
+    public List<Zfryjdm2405301> getZfryjdmListByCode(Zfryjdm2405301 zfryjdm2405301){
+        Zfztjdm111915 zfztjdm111915=iZfztjdm111915Service.selectZfztjdmAndDeptByCode(zfryjdm2405301.getCode());
+        zfryjdm2405301.setZfdw(zfztjdm111915.getSubName());
+        zfryjdm2405301.setDeptId(zfztjdm111915.getDeptId());
+        List<Zfryjdm2405301> zfryjdm2405301List=this.selectZfryjdmByDeptId(zfryjdm2405301);
+        for(int i=0;i<zfryjdm2405301List.size();i++){
+            if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())&&zfryjdm2405301List.get(i).getPhoneNumber().length()>11) {
+                zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber()));
+            }
+        }
+        return zfryjdm2405301List;
+    }
 }
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 9e97c3bc..3a09f4ed 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
@@ -3,19 +3,108 @@ package com.zdxt.code.service.impl;
 import com.zdxt.code.domain.Zfryjdm2405301;
 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;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
     @Autowired
     private Zfztjdm111915Mapper zfztjdm111915Mapper;
+    @Autowired
+    private IZfryjdm2405301Service iZfryjdm2405301Service;
     @Override
     public List<Zfztjdm111915> selectZfztjdmList(Zfztjdm111915 zfztjdm111915){
         return zfztjdm111915Mapper.selectZfztjdmList(zfztjdm111915);
     }
+
+    @Override
+    public List<Zfztjdm111915> selectZfztjdmListAndDept(String subName) {
+        return zfztjdm111915Mapper.selectZfztjdmListAndDept(subName);
+    }
+
+    @Override
+    public List<Zfztjdm111915> getDeptStaticList(Zfryjdm2405301 zfryjdm2405301) {
+//        int totalNumber=0;
+        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.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());
+//            totalNumber=totalNumber+ancestorList.size();
+            zfztjdm111915List.get(i).setNumber(ancestorList.size());
+            if(ancestorList.size()>0){
+                hasList.add(zfztjdm111915List.get(i));
+            }
+        }
+        if((zfryjdm2405301.getName()!=null&&!zfryjdm2405301.getName().equals(""))||(zfryjdm2405301.getZfcode()!=null&&!zfryjdm2405301.getZfcode().equals(""))){
+            return hasList;
+        }else{
+            return zfztjdm111915List;
+        }
+    }
+    @Override
+    public int getZFRYNumber(Zfryjdm2405301 zfryjdm2405301) {
+        int totalNumber=0;
+        List<Zfztjdm111915> zfztjdm111915List = this.selectZfztjdmListAndDept(zfryjdm2405301.getZfdw());
+//        Map<String,Zfztjdm111915> zfztjdm111915Map=zfztjdm111915List.stream().collect(Collectors.toMap(Zfztjdm111915::getCode, Function.identity()));
+        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());
+            totalNumber=totalNumber+ancestorList.size();
+            zfztjdm111915List.get(i).setNumber(ancestorList.size());
+        }
+        return totalNumber;
+    }
+
+    @Override
+    public Zfztjdm111915 selectZfztjdmAndDeptByCode(String code) {
+        return zfztjdm111915Mapper.selectZfztjdmAndDeptByCode(code);
+    }
+
+    @Override
+    public List<Zfryjdm2405301> export(Zfryjdm2405301 zfryjdm2405301) {
+        List<Zfztjdm111915> zfztjdm111915List = this.selectZfztjdmListAndDept(zfryjdm2405301.getZfdw());
+        List<Zfryjdm2405301> hasList=new ArrayList<>();
+        List<Zfryjdm2405301> allList=new ArrayList<>();
+        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());
+            for(int k=0;k<ancestorList.size();k++){
+                ancestorList.get(k).setZfdw(zfztjdm111915List.get(i).getSubName());
+                if(ancestorList.get(k).getPhoneNumber()!=null&&!"".equals(ancestorList.get(k).getPhoneNumber())&&ancestorList.get(k).getPhoneNumber().length()>11) {
+                    ancestorList.get(k).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", ancestorList.get(k).getPhoneNumber()));
+                }
+            }
+            allList.addAll(ancestorList);
+            if(ancestorList.size()>0){
+                hasList.addAll(ancestorList);
+            }
+        }
+        if((zfryjdm2405301.getName()!=null&&!zfryjdm2405301.getName().equals(""))||(zfryjdm2405301.getZfcode()!=null&&!zfryjdm2405301.getZfcode().equals(""))){
+            return hasList;
+        }else{
+            return allList;
+        }
+    }
+    public Boolean ancestorHasIt(String ancestors,String deptId,String deptIdZFRY){
+        if(ancestors==null||ancestors.equals("")||deptIdZFRY==null||deptIdZFRY.equals("")||deptId==null||deptId.equals("")){
+            return false;
+        }else{
+            List<String> ancestorsList= Arrays.asList(ancestors.split(","));
+            return ancestorsList.contains(deptId)||deptId.equals(deptIdZFRY);
+        }
+
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
index 90a67676..a6601dc4 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
@@ -56,6 +56,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by zzjgdm
     </select>
 
+    <select id="selectZfryjdmAndUserListGroupBy" parameterType="Zfryjdm2405301" resultMap="ZfryjdmResult">
+        select name, zzjgdm, zfdw, sub_name, zfcode, sfzcode_encrypt,x.dept_id as deptId,phoneNumber as phoneNumber,ancestors as ancestors from
+        (select* from
+        (select name, zzjgdm, zfdw, sub_name, zfcode, sfzcode_encrypt from zfryjdm2405301
+        <where>
+            and code_state = '01'
+            and name is not null
+            and zfdw is not null
+            and zfcode is not null
+            <if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
+            <if test="zfcode != null and zfcode != ''">and zfcode like concat('%',#{zfcode},'%')</if>
+        </where>
+        group by sfzcode) z
+        left join (select dept_id,phoneNumber, certificateNumber from sys_user where law_certificate_num is not null and user_source = 0 and status='0' and del_flag='0' group by certificateNumber) u
+        on z.sfzcode_encrypt=u.certificateNumber
+        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
+        order by zzjgdm
+    </select>
+
+    <select id="selectZfryjdmByDeptId" parameterType="Zfryjdm2405301" resultMap="ZfryjdmResult">
+        select name, zzjgdm, #{zfdw} as zfdw, sub_name, zfcode, sfzcode_encrypt,x.dept_id as deptId,phoneNumber as phoneNumber,ancestors as ancestors from
+        (select* from
+        (select name, zzjgdm, zfdw, sub_name, zfcode, sfzcode_encrypt from zfryjdm2405301
+        <where>
+            and code_state = '01'
+            and name is not null
+            and zfdw is not null
+            and zfcode is not null
+            <if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
+            <if test="zfcode != null and zfcode != ''">and zfcode like concat('%',#{zfcode},'%')</if>
+        </where>
+        group by sfzcode) z
+        left join (select dept_id,phoneNumber, certificateNumber from sys_user where law_certificate_num is not null and user_source = 0 and status='0' and del_flag='0' group by certificateNumber) u
+        on z.sfzcode_encrypt=u.certificateNumber
+        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 FIND_IN_SET(#{deptId},d.ancestors)
+        order by zzjgdm
+    </select>
+
     <update id="updateZfryjdmSfzcodeByid" parameterType="Zfryjdm2405301">
         update zfryjdm2405301
         <trim prefix="SET" suffixOverrides=",">
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
index bb8cd375..6162eebe 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml
@@ -25,4 +25,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         group by CODE
     </select>
+    <select id="selectZfztjdmListAndDept" parameterType="String" 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>
+        </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
+        (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="code!=null and code!=''">and t.code=#{code}</if>
+        </where>
+        group by t.code
+    </select>
 </mapper>
\ No newline at end of file