From 1b8e15af6e4e2458706938c6dbcbd3a6ca7a8928 Mon Sep 17 00:00:00 2001
From: server <zhaoxinyu0716@gmail.com>
Date: Thu, 11 Sep 2025 15:30:12 +0800
Subject: [PATCH] ..

---
 .../app/zhgh/welfare/controller/WelfareListController.java | 7 +++++--
 .../zhgh/welfare/service/impl/WelfareListServiceImpl.java  | 6 ++++--
 .../welfare/service/impl/WelfareProjectServiceImpl.java    | 6 ++++--
 .../service/impl/WelfareSelectionSituationServiceImpl.java | 1 +
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java
index 963a999..a6d1c14 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java
@@ -158,9 +158,12 @@ public class WelfareListController {
             if (user != null) {
                 WelfareList list = new WelfareList();
                 list.setUserId(user.getId());
-                list.setWelfareUnitId(user.getUnionId());
+                list.setWelfareUnitId(user.getUnitId());
+                list.setWelfareUnitName(user.getUnitName());
+                list.setWelfareUnionId(user.getUnionId());
+                list.setWelfareUnionName(user.getUnionName());
                 list.setProjectId(businessId);
-                list.setWelfareSecondLevelUnitId(user.getUnitId());
+//                list.setWelfareSecondLevelUnitId(user.getUnitId());
                 list.setPersonType(user.getPersonType());
                 list.setUserState(user.getUserState());
                 welfareLists.add(list);
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
index af802de..2208329 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
@@ -370,8 +370,10 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
             WelfareList welfareList = new WelfareList();
             welfareList.setProjectId(id);
             welfareList.setUserId(v.getId());
-            welfareList.setWelfareUnitId(v.getUnionId());
-            welfareList.setWelfareSecondLevelUnitId(v.getUnitId());
+            welfareList.setWelfareUnitId(v.getUnitId());
+            welfareList.setWelfareUnitName(v.getUnitName());
+            welfareList.setWelfareUnionId(v.getUnionId());
+            welfareList.setWelfareUnionName(v.getUnionName());
             welfareList.setPersonType(v.getPersonType());
             welfareList.setUserState(v.getUserState());
             return welfareList;
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java
index 7f103fc..4e48851 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java
@@ -175,8 +175,10 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl<WelfareProject> i
             WelfareList list = new WelfareList();
             list.setProjectId(projectId);
             list.setUserId(user.getString("id"));
-            list.setWelfareUnitId(user.getString("unionId"));
-            list.setWelfareSecondLevelUnitId(user.getString("unitId"));
+            list.setWelfareUnitId(user.getString("unitId"));
+            list.setWelfareUnitName(user.getString("unitName"));
+            list.setWelfareUnionId(user.getString("unionId"));
+            list.setWelfareUnionName(user.getString("unionName"));
             list.setPersonType(user.getString("personType"));
             list.setUserState(user.getString("userState"));
             lists.add(list);
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 980202c..e02c8df 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
@@ -46,6 +46,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                   t1.userId,
                   t1.welfareUnionName,
                   t1.welfareUnitName,
+                  t1.welfareUnitId,
                   GROUP_CONCAT(DISTINCT t3.optionName) AS selectedOptions,
                   GROUP_CONCAT(DISTINCT t2.mobile) AS mobile,
                   GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress,