From bf40155fb9e6d9f7753e882ad5d9e167bcb0327c Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Mon, 31 Aug 2026 15:18:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E6=B4=BB=E5=8A=A8=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0=E6=A0=A1=E5=B7=A5?= =?UTF-8?q?=E4=BC=9A=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E5=91=98=E7=9C=8B?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=B4=BB=E5=8A=A8=20=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E5=8A=A0=E4=B8=8D?= =?UTF-8?q?=E4=BA=86=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/budwk/app/sys/controller/SysRoleController.java | 3 ++- .../statistics/TrainSignUpActivityStatisticsController.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysRoleController.java b/src/main/java/com/budwk/app/sys/controller/SysRoleController.java index 83de63fe..cc2dfcff 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysRoleController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysRoleController.java @@ -439,7 +439,8 @@ public class SysRoleController { public Object userSearch(@Param("query") String keyword, @Param("roleId") String roleId) { try { Sys_user user = sysUserService.getUserById(SecurityUtil.getUserId()); - return Result.success().addData(sysRoleService.userSearch(roleId, keyword, StpUtil.hasRole("SYSADMIN"), user.getUnit())); + Sys_unit unit = sysUnitService.fetch(user.getUnitId()); + return Result.success().addData(sysRoleService.userSearch(roleId, keyword, StpUtil.hasRole("SYSADMIN"), unit)); } catch (Exception e) { return Result.error(); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java index aebe340a..334b8868 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java @@ -96,7 +96,7 @@ public class TrainSignUpActivityStatisticsController { @SaCheckPermission("trainSignUp.statistics") public Result activityList(@Param(value = "year") Integer year) { List list = dao.query(TrainSignUpActivity.class, Cnd.NEW().andEX("year", "=", year).desc("activityStartTime")); - if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) { + if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_ACTIVITY_ADMIN.name())) { // 获取当前登录用户的工会 String unionId = SecurityUtil.getUnionId(); // 获取当前登录用户的社团