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

校工会会计SCHOOL_UNION_ACCOUNTANT添加费用报销最高权限

Browse Source
This commit is contained in:
c-hongqw1
2026-10-10 10:00:12 +08:00
parent 5f1b8331c1
commit 67c840a62b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/service/impl/ActivityReimbursementServiceImpl.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class ActivityReimbursementServiceImpl extends BaseServiceImpl<ActivityRe
cnd.and("YEAR(ab.applyDate)", "=", DateUtil.thisYear()); cnd.and("YEAR(ab.applyDate)", "=", DateUtil.thisYear());
cnd.and("ins.state", "=", 20); cnd.and("ins.state", "=", 20);
cnd.and("ab.outlayManageSource", "=", outlayManageSource); cnd.and("ab.outlayManageSource", "=", outlayManageSource);
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ACCOUNTANT.name())) {
if (Objects.equals("ACTIVITY_BUDGET_TYPE_TWO", outlayManageSource)) { if (Objects.equals("ACTIVITY_BUDGET_TYPE_TWO", outlayManageSource)) {
cnd.and("ab.unionId", "=", SecurityUtil.getUnionId()); cnd.and("ab.unionId", "=", SecurityUtil.getUnionId());
} else if (Objects.equals("ACTIVITY_BUDGET_TYPE_THREE", outlayManageSource)) { } else if (Objects.equals("ACTIVITY_BUDGET_TYPE_THREE", outlayManageSource)) {
src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class ClubCommonController {
@SaCheckLogin @SaCheckLogin
public Result listClubByRole() { public Result listClubByRole() {
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
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); Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT);
List<Sys_user_role> userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List<Sys_user_role> userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId()));
List<String> myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); List<String> myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList();
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html
+1 -1
View File
@@ -518,7 +518,7 @@ layout("/layouts/platform.html"){
this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE").then(resp => { this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE").then(resp => {
this.budgetTypeOption = resp this.budgetTypeOption = resp
const budgetTypeCloseOption = [] const budgetTypeCloseOption = []
if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN", "SCHOOL_UNION_ACCOUNTANT"])) {
} else { } else {
if (this.$auth.hasRoleOr(["SCHOOL_REIMBURSEMENT_MANAGER"])) { if (this.$auth.hasRoleOr(["SCHOOL_REIMBURSEMENT_MANAGER"])) {