From a812089eb2249b894458d2073476a682d0e40f73 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Tue, 18 Aug 2026 09:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=89=A7=E6=B3=95?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StatisticsBureauUnitReportMapper.xml      | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/StatisticsBureauUnitReportMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/StatisticsBureauUnitReportMapper.xml
index 314a4d2b..93758142 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/StatisticsBureauUnitReportMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/StatisticsBureauUnitReportMapper.xml
@@ -11,8 +11,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     -->
     <select id="selectZfztjdmListAndDeptScope" resultType="com.zdxt.enforcementcode.domain.vo.report.BureauUnitStatVo">
         SELECT
-            d.dept_id AS sysDeptId,
-            t.sub_name AS unitName
+           <!-- d.dept_id AS sysDeptId,
+            t.sub_name AS unitName-->
+        ANY_VALUE(d.dept_id) as sysDeptId,
+        ANY_VALUE(t.sub_name) as unitName
         FROM zfztjdm111915 t
         LEFT JOIN (
             SELECT dept_id, ancestors, creditcode
@@ -45,13 +47,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     -->
     <select id="selectPersonnelGroupBy" resultType="com.zdxt.enforcementcode.domain.vo.report.BureauUnitPersonnelMatchVo">
         SELECT
-            x.name, x.zzjgdm, x.zfdw, x.zfcode, x.sfzcode_encrypt AS sfzcodeEncrypt,
-            x.dept_id AS deptId, x.phoneNumber, d.ancestors AS ancestors
+            x.name,
+            x.zzjgdm,
+            x.zfdw,
+            x.zfcode,
+            x.sfzcode_encrypt AS sfzcodeEncrypt,
+            x.dept_id AS deptId,
+            x.phoneNumber,
+            d.ancestors AS ancestors
         FROM (
-            SELECT z.name, z.zzjgdm, z.zfdw, z.zfcode, z.sfzcode_encrypt,
-                   u.dept_id, u.phonenumber AS phoneNumber
+            SELECT
+                ANY_VALUE(z.name) as name,
+                ANY_VALUE(z.zzjgdm) as zzjgdm,
+                ANY_VALUE(z.zfdw) as zfdw,
+                ANY_VALUE(z.zfcode) as zfcode,
+                z.sfzcode_encrypt,
+                ANY_VALUE(u.dept_id) as dept_id,
+                ANY_VALUE(u.phonenumber) as phoneNumber
             FROM (
-                SELECT name, zzjgdm, zfdw, sub_name, zfcode, sfzcode_encrypt
+                SELECT
+                    name,
+                    zzjgdm,
+                    zfdw,
+                    sub_name,
+                    zfcode,
+                    sfzcode_encrypt
                 FROM zfryjdm2405301
                 WHERE code_state = '01'
                   AND name IS NOT NULL AND name != ''
@@ -65,7 +85,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </if>
             ) z
             LEFT JOIN (
-                SELECT dept_id, phonenumber, certificateNumber
+                SELECT
+                    dept_id,
+                    phonenumber,
+                    certificateNumber
                 FROM sys_user
                 WHERE law_certificate_num IS NOT NULL
                   AND user_source = 0