From 085c572a18f09e748d0cf57de1fccaa0416377e8 Mon Sep 17 00:00:00 2001
From: hongqiwei <1143662660@qq.com>
Date: Fri, 4 Sep 2026 09:36:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=9C=AA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WelfareSelectionSituationServiceImpl.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java
index 4711484..5e46e3e 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java
@@ -106,6 +106,9 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
         }
     }
 
+    /**
+     * 查询选择情况时，已选择人员返回本次选择填写的手机号；未选择人员回退到系统手机号。
+     */
     @Override
     public Pagination pageData(WelfareSelectionSituationPageForm pageForm) {
         Sql sql = Sqls.create("""
@@ -117,7 +120,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                   t1.welfareUnitName,
                   t1.welfareUnitId,
                   GROUP_CONCAT(DISTINCT t3.optionName ,'（',t2.selectNum,'份）') AS selectedOptions,
-                  GROUP_CONCAT(DISTINCT t2.mobile) AS mobile,
+                  COALESCE(NULLIF(GROUP_CONCAT(DISTINCT t2.mobile), ''), t4.mobile) AS mobile,
                   GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress,
                   t4.username AS userName,
                   t4.loginname AS loginName,
@@ -859,6 +862,9 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                 .toList();
     }
 
+    /**
+     * 导出选择情况时，联系电话取值规则与页面查询保持一致。
+     */
     @Override
     public void exportXlsx(WelfareSelectionSituationPageForm pageForm, HttpServletResponse response) {
         Sql sql = Sqls.create("""
@@ -867,7 +873,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                   t1.welfareUnionName,
                   t1.welfareUnitName,
                   GROUP_CONCAT(DISTINCT t3.optionName,'（',t2.selectNum,'份）') AS selectedOptions,
-                  GROUP_CONCAT(DISTINCT t2.mobile) AS mobile,
+                  COALESCE(NULLIF(GROUP_CONCAT(DISTINCT t2.mobile), ''), t4.mobile) AS mobile,
                   GROUP_CONCAT(DISTINCT t2.userName) AS userName2,
                   GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress,
                   GROUP_CONCAT(DISTINCT CASE WHEN t2.createdBy IS NOT NULL AND t2.createdBy <> t2.selectUserId THEN CONCAT(t5.username, '代选') END) AS remark,