diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyCommonController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyCommonController.java index 6b47fd7..8d47f4e 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyCommonController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyCommonController.java @@ -39,8 +39,9 @@ public class MemberApplyCommonController { return Result.success(user); } - // 分会主席只能查看本分会用户或未分配分会的用户 分工会操作员同主席权限一致 - if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name()) && (user.getUnionId().equals(SecurityUtil.getUnionId()) || StrUtil.isBlank(user.getUnionId()))) { + // 分工会主席、操作员和委员只能查看本分工会用户或未分配分工会的用户。 + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name(), + RoleConstant.BRANCH_UNION_WY.name()) && (user.getUnionId().equals(SecurityUtil.getUnionId()) || StrUtil.isBlank(user.getUnionId()))) { user.setIdCard(DesensitizedUtil.idCardNum(user.getIdCard(), 3, 4)); user.setMobile(DesensitizedUtil.mobilePhone(user.getMobile())); return Result.success(user); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java index e813fca..9d940e3 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java @@ -156,7 +156,8 @@ public class MemberChangeApplyController { * @return */ @At - @SaCheckPermission(value = {"member.change.branchUnion.audit","member.change.schoolUnion.audit", "member.change.unionGroup.audit"}, mode = SaMode.OR) + @SaCheckPermission(value = {"member.change.branchUnion.audit", "member.change.schoolUnion.audit", + "member.change.unionGroup.audit", "member.change.mange", "staff.member.change.mange"}, mode = SaMode.OR) public Result getUserByIdForMemberChange(String userId){ View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", userId)); NutMap nutMap = Lang.obj2nutmap(user); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java index 809b535..945fc86 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java @@ -113,7 +113,9 @@ public class MemberChangeManageController { } boolean schoolRoleBool = AuthUtil.hasRoleOr(RoleConstant.SCHOOL_UNION_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_MEMBER_ADMIN.name(), RoleConstant.SYSADMIN.name()); - boolean branchRoleBool = AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name()); + // 分工会委员与分工会管理员使用同一提交路线,提交后直接进入校工会审核节点。 + boolean branchRoleBool = AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name(), + RoleConstant.BRANCH_UNION_WY.name()); boolean groupRoleBool = AuthUtil.hasRole(RoleConstant.BRANCH_UNION_GROUP_LEADER.name()); // 变更类型 diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java index 365b24d..de7dcbd 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java @@ -68,7 +68,9 @@ public class MemberManagePageForm extends PageForm { cnd = Cnd.NEW(); } if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) { + // 分工会主席、操作员和委员均只能查询当前登录人所属分工会的人员。 + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name(), + RoleConstant.BRANCH_UNION_WY.name())) { cnd.and("u.unionId", "=", SecurityUtil.getUnionId()); } else if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_GROUP_LEADER.name())) { cnd.and("u.unionGroupId", "=", SecurityUtil.getUnionGroupId()); diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html index 9a28417..2c14fc8 100644 --- a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html @@ -96,7 +96,7 @@ layout("/layouts/platform.html"){ placeholder="请选择所属工会" style="width: 100%" v-model="pageForm.unionId"> diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html index 4634ae7..ecdab35 100644 --- a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html @@ -24,7 +24,7 @@ layout("/layouts/platform.html"){ diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html index 55b9d75..efe18a4 100644 --- a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html @@ -51,7 +51,7 @@ layout("/layouts/platform.html"){ placeholder="请选择所属工会" v-model="pageForm.unionId"> diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html index a710f0e..3b06755 100644 --- a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html @@ -56,7 +56,7 @@ layout("/layouts/platform.html"){ placeholder="请选择所属工会" v-model="pageForm.unionId"> diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html index 9560433..c1d9978 100644 --- a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html @@ -61,7 +61,7 @@ layout("/layouts/platform.html"){ placeholder="请选择所属工会" v-model="pageForm.unionId"> diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html index 955d95b..90a4bdb 100644 --- a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html @@ -69,7 +69,7 @@ layout("/layouts/platform.html"){ placeholder="请选择所属工会" v-model="pageForm.unionId"> diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/userPunchStatistics.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/userPunchStatistics.html index 49878da..0956af9 100644 --- a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/userPunchStatistics.html +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/userPunchStatistics.html @@ -64,7 +64,7 @@ layout("/layouts/platform.html"){ v-model="pageForm.unionId"> diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html index 169c0f2..6ee8ac6 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html @@ -189,7 +189,7 @@ layout("/layouts/platform.html"){ + v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_GROUP_LEADER','BRANCH_UNION_WY'])"> 变更