From 0440edd2896befc2648298ff30af8cb220dde604 Mon Sep 17 00:00:00 2001
From: dd3s_206 <zhaoxinyu0716@gmail.com>
Date: Fri, 5 Jun 2026 09:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E5=B7=A5=E7=A6=8F=E5=88=A9-=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=83=85=E5=86=B5:=20=E5=AF=BC=E5=87=BA=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=83=85=E5=86=B5=E8=A1=A8=E6=97=B6=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D(=E7=A6=8F=E5=88=A9?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=E5=BD=95=E5=85=A5)=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E5=B0=B1=E8=AF=BB=E5=8F=96=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A1=A8=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WelfareSelectionSituationServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4e0b89d..3f4c711 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
@@ -122,7 +122,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                   t1.welfareUnionName,
                   t1.welfareUnitName,
                   GROUP_CONCAT(DISTINCT t3.optionName) AS selectedOptions,
-                  GROUP_CONCAT(DISTINCT t2.mobile) AS mobile,
+                  COALESCE(GROUP_CONCAT(DISTINCT NULLIF(t2.mobile, '')), t4.mobile) AS mobile,
                   GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress,
                   CASE
                     WHEN MAX(t2.isSelectByAdmin) = 1 THEN '是'