体育活动-福利

src/main/java/com/budwk/app/zhgh/welfare/model/WelfareUserSelection.java

@@ -50,6 +50,11 @@ public class WelfareUserSelection extends BaseModel implements Serializable {
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String selectUserId;
 
+    @Column
+    @Comment("选择用户")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String userName;
+
     @Column
     @Comment("选择时间")
     @ColDefine(type = ColType.DATETIME)

src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java

@@ -16,6 +16,7 @@ import com.budwk.app.base.result.Result;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.base.utils.PageUtil;
+import com.budwk.app.sys.models.Sys_union;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -392,7 +393,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
                   t2.birthday
                 FROM
                   `welfare_list` t1
-                  LEFT JOIN sys_user t2 ON t2.id = t1.userId
+                  LEFT JOIN `vw_user` t2 ON t2.id = t1.userId
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
@@ -408,6 +409,9 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
         if (pageForm.getBirthMonths() != null && pageForm.getBirthMonths().length > 0) {
             cnd.andEX("MONTH(t2.birthday)", "in", pageForm.getBirthMonths());
         }
+        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+            cnd.and("t2.unionId", "=", SecurityUtil.getUnionId());
+        }
         cnd.andEX("t1.welfareUnitId", "in", pageForm.getUnitIds());
         cnd.andEX("t1.welfareUnionId", "=", pageForm.getUnionId());
         cnd.andEX("t1.personType", "in", pageForm.getPersonTypes());