diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java index 5be957e..ca0c952 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java @@ -100,7 +100,9 @@ public class ActivityCultureUserStatisticsController { Cnd cnd = Cnd.NEW(); cnd.and("atp.tissueId", "=", activityId); cnd.andEX("atp.unionId", "=", unionId); - if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), + RoleConstant.SCHOOL_UNION_ADMIN.name(), + RoleConstant.SCHOOL_UNION_ACTIVITY_ADMIN.name())) { if (List.of(40001, 40002).contains(activity_type)) { cnd.and("atp.unionId", "=", SecurityUtil.getUnionId()); } else if (activity_type == 40003) { @@ -157,7 +159,9 @@ public class ActivityCultureUserStatisticsController { Cnd cnd = Cnd.where("tissue.activity_type", "=", activity_type); cnd.and("tissue.projectTypeCode", "!=", 50004); - if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), + RoleConstant.SCHOOL_UNION_ADMIN.name(), + RoleConstant.SCHOOL_UNION_ACTIVITY_ADMIN.name())) { cnd.and("tissue.signUpMethod", "in", List.of(1, 2, 3)); if (activity_type == 40002) { cnd.and("tissue.unionId", "=", SecurityUtil.getUnionId()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java index 7d88a4e..b34a62a 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java @@ -80,7 +80,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl } @Override - public Object pageData(PageForm page, String year, String name,Double money, String unionId, String projectTypeCode, Integer activity_type) { + public Object pageData(PageForm page, String year, String name, Double money, String unionId, String projectTypeCode, Integer activity_type) { Cnd cnd = Cnd.NEW(); Sql sql = Sqls.create(""" @@ -131,7 +131,8 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl SqlExpressionGroup group = new SqlExpressionGroup(); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), - RoleConstant.SCHOOL_UNION_ADMIN.name())) { + RoleConstant.SCHOOL_UNION_ADMIN.name(), + RoleConstant.SCHOOL_UNION_ACTIVITY_ADMIN.name())) { if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { group.or("tissue.unionId", "=", SecurityUtil.getUnionId()); } else if (AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name())) {