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

1、人员单位变更、校工会审核

Browse Source 
2、pc端健步走模块分工会查询框显示有误
This commit is contained in:
c-zhangr1
2026-09-21 11:16:34 +08:00
parent 8524150f79
commit 35f54eafc7
12 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyCommonController.java
+3 -2
View File
@@ -39,8 +39,9 @@ public class MemberApplyCommonController {
return Result.success(user); 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.setIdCard(DesensitizedUtil.idCardNum(user.getIdCard(), 3, 4));
user.setMobile(DesensitizedUtil.mobilePhone(user.getMobile())); user.setMobile(DesensitizedUtil.mobilePhone(user.getMobile()));
return Result.success(user); return Result.success(user);
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java
+2 -1
View File
@@ -156,7 +156,8 @@ public class MemberChangeApplyController {
* @return * @return
*/ */
@At @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){ public Result getUserByIdForMemberChange(String userId){
View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", userId)); View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", userId));
NutMap nutMap = Lang.obj2nutmap(user); NutMap nutMap = Lang.obj2nutmap(user);
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java
+3 -1
View File
@@ -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 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()); boolean groupRoleBool = AuthUtil.hasRole(RoleConstant.BRANCH_UNION_GROUP_LEADER.name());
// 变更类型 // 变更类型
src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java
+3 -1
View File
@@ -68,7 +68,9 @@ public class MemberManagePageForm extends PageForm {
cnd = Cnd.NEW(); 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())) {
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()); cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
} else if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_GROUP_LEADER.name())) { } else if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_GROUP_LEADER.name())) {
cnd.and("u.unionGroupId", "=", SecurityUtil.getUnionGroupId()); cnd.and("u.unionGroupId", "=", SecurityUtil.getUnionGroupId());
src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html
+1 -1
View File
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
placeholder="请选择所属工会" style="width: 100%" v-model="pageForm.unionId"> placeholder="请选择所属工会" style="width: 100%" v-model="pageForm.unionId">
<el-option <el-option
:key="item.id" :key="item.id"
:label="item.unionname" :label="item.name"
:value="item.id" :value="item.id"
v-for="item in unionOptions"> v-for="item in unionOptions">
</el-option> </el-option>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html
+1 -1
View File
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
<el-option <el-option
v-for="item in unionList" v-for="item in unionList"
:key="item.id" :key="item.id"
:label="item.unionname" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html
+1 -1
View File
@@ -51,7 +51,7 @@ layout("/layouts/platform.html"){
placeholder="请选择所属工会" v-model="pageForm.unionId"> placeholder="请选择所属工会" v-model="pageForm.unionId">
<el-option <el-option
:key="item.id" :key="item.id"
:label="item.unionname" :label="item.name"
:value="item.id" :value="item.id"
v-for="item in unionOptions"> v-for="item in unionOptions">
</el-option> </el-option>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html
+1 -1
View File
@@ -56,7 +56,7 @@ layout("/layouts/platform.html"){
placeholder="请选择所属工会" v-model="pageForm.unionId"> placeholder="请选择所属工会" v-model="pageForm.unionId">
<el-option <el-option
:key="item.id" :key="item.id"
:label="item.unionname" :label="item.name"
:value="item.id" :value="item.id"
v-for="item in unionOptions"> v-for="item in unionOptions">
</el-option> </el-option>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html
+1 -1
View File
@@ -61,7 +61,7 @@ layout("/layouts/platform.html"){
placeholder="请选择所属工会" v-model="pageForm.unionId"> placeholder="请选择所属工会" v-model="pageForm.unionId">
<el-option <el-option
:key="item.id" :key="item.id"
:label="item.unionname" :label="item.name"
:value="item.id" :value="item.id"
v-for="item in unionOptions"> v-for="item in unionOptions">
</el-option> </el-option>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html
+1 -1
View File
@@ -69,7 +69,7 @@ layout("/layouts/platform.html"){
placeholder="请选择所属工会" v-model="pageForm.unionId"> placeholder="请选择所属工会" v-model="pageForm.unionId">
<el-option <el-option
:key="item.id" :key="item.id"
:label="item.unionname" :label="item.name"
:value="item.id" :value="item.id"
v-for="item in unionOptions"> v-for="item in unionOptions">
</el-option> </el-option>
src/main/resources/views/platform/zhgh/activity/fitnesswalk/userPunchStatistics.html
+1 -1
View File
@@ -64,7 +64,7 @@ layout("/layouts/platform.html"){
v-model="pageForm.unionId"> v-model="pageForm.unionId">
<el-option <el-option
:key="item.id" :key="item.id"
:label="item.unionname" :label="item.name"
:value="item.id" :value="item.id"
v-for="item in unionOptions"></el-option> v-for="item in unionOptions"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html
+1 -1
View File
@@ -189,7 +189,7 @@ layout("/layouts/platform.html"){
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
:command="{type:'change',data:row}" :command="{type:'change',data:row}"
v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_GROUP_LEADER'])"> v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_GROUP_LEADER','BRANCH_UNION_WY'])">
变更 变更
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>