commit

src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java

@@ -8,11 +8,9 @@ import com.budwk.app.base.service.BaseService;
 import com.budwk.app.bpm.enums.BpmProcessInstanceStatusEnum;
 import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum;
 import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
-import com.budwk.app.sys.models.Sys_role;
-import com.budwk.app.sys.models.Sys_user_role;
-import com.budwk.app.sys.services.SysRoleService;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.club.model.ClubUser;
 import com.budwk.app.zhgh.club.model.SysClub;
 import com.budwk.app.zhgh.club.service.SysClubService;
 import org.nutz.dao.Cnd;
@@ -38,8 +36,6 @@ public class ClubCommonController {
 
     @Inject
     private SysClubService sysClubService;
-    @Inject
-    private SysRoleService sysRoleService;
 
     @At
     @SaCheckLogin
@@ -62,9 +58,9 @@ public class ClubCommonController {
     public Result listClubByRole() {
         Cnd cnd = Cnd.NEW();
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-            Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT);
-            List<Sys_user_role> userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId()));
-            List<String> myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList();
+            // 报销申请只允许选择当前用户已加入的协会，避免看到未加入的协会数据。
+            List<ClubUser> clubUsers = sysClubService.dao().query(ClubUser.class, Cnd.where("userId", "=", SecurityUtil.getUserId()));
+            List<String> myClubId = clubUsers.stream().map(ClubUser::getClubId).distinct().toList();
             cnd.and("c.id", "in", myClubId);
         }
         cnd.and("inst.state","=",ProcessInstanceStateEnum.FINISHED.getCode());