From d236f94489cf5dbc1fead59d704efcccd52c98bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com> Date: Mon, 22 Dec 2025 17:40:41 +0800 Subject: [PATCH] commit --- .../controller/ActivityDeclareMineController.java | 10 ---------- .../declarereimbursement/vo/CommonPageParam.java | 13 ++++++++----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java index b6b800a..ddc4ee8 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java @@ -126,16 +126,6 @@ public class ActivityDeclareMineController { """); Cnd cnd = Cnd.NEW(); pageParam.buildSearch(cnd, "info."); - if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_MEMBER_ADMIN.name())) { - SqlExpressionGroup group = new SqlExpressionGroup(); - if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_WENTI_SPORTS.name())) { - group.or("info.unionId", "=", SecurityUtil.getUnionId()); - } - if (AuthUtil.hasRoleOr(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_OPERATOR.name())) { - group.or("info.userId", "=", SecurityUtil.getUserId()); - } - cnd.and(group); - } if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { cnd.desc("info.applyTime"); } else { diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java index 52d106e..2706481 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java @@ -51,15 +51,18 @@ public class CommonPageParam extends PageForm { if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and(prefix + "declareUnitName", "<>", ActivityDeclareReimbursement.SCHOOL_UNION.name()); + SqlExpressionGroup group = new SqlExpressionGroup(); if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) { - cnd.and(prefix + "unionid", "=", SecurityUtil.getUnionId()); - } else if (AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_PRESIDENT.name())) { -// cnd.and(prefix + "clubId", "=", ); - } else { - cnd.andEX(prefix + "userId", "=", SecurityUtil.getUserId()); + group.or(prefix + "unionid", "=", SecurityUtil.getUnionId()); } + if (AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_PRESIDENT.name())) { +// cnd.and(prefix + "clubId", "=", ); + group.or(prefix + "clubId", "in", SecurityUtil.getClubIds()); + } + group.or(prefix + "userId", "=", SecurityUtil.getUserId()); + cnd.and(group); } else { cnd.andEX(prefix + "unionId", "=", this.getUnionId()); cnd.andEX(prefix + "clubId", "=", this.getClubId());