c-zhouhf1/zhgh_cug
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release_20260831' into release_20260831

Browse Source
This commit is contained in:
c-chengc1
2026-08-31 15:30:03 +08:00
parent 120f0bd046 2341b136ca
commit 3f741ebab6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/controller/SysRoleController.java
+2 -1
View File
@@ -439,7 +439,8 @@ public class SysRoleController {
public Object userSearch(@Param("query") String keyword, @Param("roleId") String roleId) { public Object userSearch(@Param("query") String keyword, @Param("roleId") String roleId) {
try { try {
Sys_user user = sysUserService.getUserById(SecurityUtil.getUserId()); 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) { } catch (Exception e) {
return Result.error(); return Result.error();
} }
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class TrainSignUpActivityStatisticsController {
@SaCheckPermission("trainSignUp.statistics") @SaCheckPermission("trainSignUp.statistics")
public Result activityList(@Param(value = "year") Integer year) { public Result activityList(@Param(value = "year") Integer year) {
List<TrainSignUpActivity> list = dao.query(TrainSignUpActivity.class, Cnd.NEW().andEX("year", "=", year).desc("activityStartTime")); List<TrainSignUpActivity> 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(); String unionId = SecurityUtil.getUnionId();
// 获取当前登录用户的社团 // 获取当前登录用户的社团