会员

2024-12-31 16:31:42 +08:00
parent fdc7a6c53b
commit d6d077186f
6 changed files with 407 additions and 375 deletions
@@ -181,9 +181,10 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
                	wpus.receiveAddress,
                	wpus.welfareId,
                	wpus.selectUserId,
-                	wl.welfareUnitId as unionId
+                	IF(staff.unionRelationUnionId is not null, staff.unionRelationUnionId, wl.welfareUnitId) AS unionId
                FROM
                	`welfare_project_user_selection` wpus
+                	LEFT JOIN special_staff staff ON staff.userId = wpus.selectUserId
                	LEFT JOIN welfare_list wl on wl.userId = wpus.selectUserId AND wpus.welfareId = wl.projectId
                $condition
                """);