福利未选择显示默认手机号,优先福利手机号

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,