From 6eb775da914bcde5f087aa1f3d67ed17933277d9 Mon Sep 17 00:00:00 2001
From: hongqiwei <1143662660@qq.com>
Date: Fri, 4 Sep 2026 11:04:25 +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?=
 =?UTF-8?q?,=E4=BC=98=E5=85=88=E7=A6=8F=E5=88=A9=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WelfareSelectionSituationServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 5e46e3e..ea5f150 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
@@ -107,7 +107,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
     }
 
     /**
-     * 查询选择情况时，已选择人员返回本次选择填写的手机号；未选择人员回退到系统手机号。
+     * 查询选择情况时，优先返回本次选择填写的手机号；未选择人员按福利手机号、系统手机号顺序回退。
      */
     @Override
     public Pagination pageData(WelfareSelectionSituationPageForm pageForm) {
@@ -120,7 +120,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                   t1.welfareUnitName,
                   t1.welfareUnitId,
                   GROUP_CONCAT(DISTINCT t3.optionName ,'（',t2.selectNum,'份）') AS selectedOptions,
-                  COALESCE(NULLIF(GROUP_CONCAT(DISTINCT t2.mobile), ''), t4.mobile) AS mobile,
+                  COALESCE(NULLIF(GROUP_CONCAT(DISTINCT t2.mobile), ''), NULLIF(t4.welfareMobile, ''), t4.mobile) AS mobile,
                   GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress,
                   t4.username AS userName,
                   t4.loginname AS loginName,
@@ -873,7 +873,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                   t1.welfareUnionName,
                   t1.welfareUnitName,
                   GROUP_CONCAT(DISTINCT t3.optionName,'（',t2.selectNum,'份）') AS selectedOptions,
-                  COALESCE(NULLIF(GROUP_CONCAT(DISTINCT t2.mobile), ''), t4.mobile) AS mobile,
+                  COALESCE(NULLIF(GROUP_CONCAT(DISTINCT t2.mobile), ''), NULLIF(t4.welfareMobile, ''), 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,