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 09:49:31 +08:00
parent 2b5ee6f1fb
commit 5f1b8331c1
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class OutlayManageClubController {
SELECT * FROM `outlay_manage_club` $condition SELECT * FROM `outlay_manage_club` $condition
"""); """);
cnd.andEX("year", "=", year); 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); Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT);
List<Sys_user_role> userRoles = baseService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List<Sys_user_role> userRoles = baseService.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/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class OutlayManageClubUseDetailController {
cnd.and("totalQuota", "IS NOT", null); cnd.and("totalQuota", "IS NOT", null);
cnd.and("year", "=", year); 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); cnd.andEX("clubId", "=", clubId);
} else { } else {
Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT);
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class OutlayManageUnionController {
SELECT * FROM `outlay_manage_union` $condition SELECT * FROM `outlay_manage_union` $condition
"""); """);
cnd.andEX("year", "=", year); 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); cnd.andEX("unionId", "=", unionId);
} else { } else {
cnd.and("unionId", "=", SecurityUtil.getUnionId()); cnd.and("unionId", "=", SecurityUtil.getUnionId());
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionUseDetailController.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class OutlayManageUnionUseDetailController {
cnd.and("totalQuota", "IS NOT", null); cnd.and("totalQuota", "IS NOT", null);
cnd.and("year", "=", year); 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); cnd.andEX("unionId", "=", unionId);
} else { } else {
cnd.and("unionId", "=", SecurityUtil.getUnionId()); cnd.and("unionId", "=", SecurityUtil.getUnionId());
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/club/useDetail/index.html
+1 -1
View File
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
</el-date-picker> </el-date-picker>
</search-item> </search-item>
<search-item label="所属协会" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])"> <search-item label="所属协会" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'SCHOOL_UNION_ACCOUNTANT'])">
<el-select clearable <el-select clearable
placeholder="请选择协会" placeholder="请选择协会"
style="width: 100%;" v-model="pageForm.clubId"> style="width: 100%;" v-model="pageForm.clubId">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html
+1 -1
View File
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"> value-format="yyyy">
</el-date-picker> </el-date-picker>
</search-item> </search-item>
<search-item label="所属工会" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])"> <search-item label="所属工会" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'SCHOOL_UNION_ACCOUNTANT'])">
<el-select placeholder="请选择所属工会" v-model="pageForm.unionId" <el-select placeholder="请选择所属工会" v-model="pageForm.unionId"
style="width: 100%;" style="width: 100%;"
clearable clearable
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/useDetail/index.html
+1 -1
View File
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
</el-date-picker> </el-date-picker>
</search-item> </search-item>
<search-item label="所属工会" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])"> <search-item label="所属工会" v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'SCHOOL_UNION_ACCOUNTANT'])">
<el-select placeholder="请选择所属工会" v-model="pageForm.unionId" <el-select placeholder="请选择所属工会" v-model="pageForm.unionId"
style="width: 100%;" style="width: 100%;"
clearable clearable