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 fc709e3d..4f918f2f 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
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -78,6 +79,7 @@ public class DeptStaticController extends BaseController {
     @ResponseBody
     public TableDataInfo list(Zfryjdm2405301 zfryjdm2405301)
     {
+        Date start=new Date();
         /*startPage();
         List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);//待权限1209
         for(int i=0;i<zfryjdm2405301List.size();i++){
@@ -87,6 +89,8 @@ public class DeptStaticController extends BaseController {
         return getDataTable(zfryjdm2405301List);}*/
         startPage();
         List<Zfztjdm111915> zfztjdm111915List=iZfztjdm111915Service.getDeptStaticList(zfryjdm2405301);
+        Date end=new Date();
+        System.out.printf("执行时长：%d 毫秒.%n", (end.getTime() - start.getTime()));
         return getDataTable(zfztjdm111915List);
     }
     @RequiresPermissions("code:deptStatic:list")
@@ -101,8 +105,11 @@ public class DeptStaticController extends BaseController {
                 zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber()));
             }
         return getDataTable(zfryjdm2405301List);}*/
+        Date start=new Date();
         startPage();
         List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.getZfryjdmListByCode(zfryjdm2405301);
+        Date end=new Date();
+        System.out.printf("执行时长：%d 毫秒.%n", (end.getTime() - start.getTime()));
         return getDataTable(zfryjdm2405301List);
     }
     @GetMapping("/export")
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
index a6601dc4..d2df806f 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml
@@ -67,9 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             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
+        </where>) 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') 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