From 5f1b8331c1b3ec90da28a619395f51fded8313c9 Mon Sep 17 00:00:00 2001 From: hongqiwei <1143662660@qq.com> Date: Sat, 10 Oct 2026 09:49:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E5=B7=A5=E4=BC=9A=E4=BC=9A=E8=AE=A1SC?= =?UTF-8?q?HOOL=5FUNION=5FACCOUNTANT=E6=B7=BB=E5=8A=A0=E7=BB=8F=E8=B4=B9?= =?UTF-8?q?=E6=9C=80=E9=AB=98=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../club/controller/OutlayManageClubController.java | 2 +- .../club/controller/OutlayManageClubUseDetailController.java | 2 +- .../union/controller/OutlayManageUnionController.java | 2 +- .../union/controller/OutlayManageUnionUseDetailController.java | 2 +- .../dayofficework/outlay/outlayManage/club/useDetail/index.html | 2 +- .../dayofficework/outlay/outlayManage/union/manage/index.html | 2 +- .../outlay/outlayManage/union/useDetail/index.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java index 47f0755..182ad04 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java @@ -65,7 +65,7 @@ public class OutlayManageClubController { SELECT * FROM `outlay_manage_club` $condition """); cnd.andEX("year", "=", year); - 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_ACCOUNTANT.name())) { Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); List userRoles = baseService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java index 9a8197d..5310b83 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java @@ -71,7 +71,7 @@ public class OutlayManageClubUseDetailController { cnd.and("totalQuota", "IS NOT", null); cnd.and("year", "=", year); - 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_ACCOUNTANT.name())) { cnd.andEX("clubId", "=", clubId); } else { Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java index 4eacf75..9569343 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java @@ -60,7 +60,7 @@ public class OutlayManageUnionController { SELECT * FROM `outlay_manage_union` $condition """); cnd.andEX("year", "=", year); - 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_ACCOUNTANT.name())) { cnd.andEX("unionId", "=", unionId); } else { cnd.and("unionId", "=", SecurityUtil.getUnionId()); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java index f7baf7e..ed22986 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java @@ -63,7 +63,7 @@ public class OutlayManageUnionUseDetailController { cnd.and("totalQuota", "IS NOT", null); cnd.and("year", "=", year); - 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_ACCOUNTANT.name())) { cnd.andEX("unionId", "=", unionId); } else { cnd.and("unionId", "=", SecurityUtil.getUnionId()); diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/useDetail/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/useDetail/index.html index 6b79b27..ff85da1 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/useDetail/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/useDetail/index.html @@ -21,7 +21,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html index a5460bf..7b7ea70 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html @@ -20,7 +20,7 @@ layout("/layouts/platform.html"){ value-format="yyyy"> - + - +