diff --git a/src/main/java/com/budwk/app/base/constant/RoleConstant.java b/src/main/java/com/budwk/app/base/constant/RoleConstant.java index a93eec8..3f28ab7 100644 --- a/src/main/java/com/budwk/app/base/constant/RoleConstant.java +++ b/src/main/java/com/budwk/app/base/constant/RoleConstant.java @@ -46,6 +46,7 @@ RoleConstant { BRANCH_UNION_WENTI_WY("分工会文体委员"), BRANCH_UNION_SHENGGHUO_WY("分工会生活委员"), BRANCH_UNION_TIAOJIE_WY("分工会调解委员"), + BRANCH_UNION_WENTI_SPORTS("分工会文体福利委员"), UNIT_PARTY_SECRETARY("单位党委书记"), diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/service/impl/TeacherCongressSessionServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/service/impl/TeacherCongressSessionServiceImpl.java index dad44c7..b5d177b 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/service/impl/TeacherCongressSessionServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/service/impl/TeacherCongressSessionServiceImpl.java @@ -69,6 +69,8 @@ public class TeacherCongressSessionServiceImpl extends BaseServiceImpl lastViceHeadUserRoles = dao().query(Sys_user_role.class, Cnd.where(Sys_user_role::getTcDelegationId, "=", lastDelegation.getId()) + .and(Sys_user_role::getRoleId, "=", delegationViceHeadRole.getId())); + for (Sys_user_role lastViceHeadUser : lastViceHeadUserRoles) { + Sys_user_role newViceHeadUser = BeanUtil.copyProperties(lastViceHeadUser, Sys_user_role.class); + newViceHeadUser.setTcDelegationId(newDelegation.getId()); + newViceHeadUser.setTcSessionId(session.getId()); + dao().insert(newViceHeadUser); + } + //联络人角色权限继承 + List lastContactUserRoles = dao().query(Sys_user_role.class, Cnd.where(Sys_user_role::getTcDelegationId, "=", lastDelegation.getId()) + .and(Sys_user_role::getRoleId, "=", delegationContactRole.getId())); + for (Sys_user_role lastContactUser : lastContactUserRoles) { + Sys_user_role newContactUser = BeanUtil.copyProperties(lastContactUser, Sys_user_role.class); + newContactUser.setTcDelegationId(newDelegation.getId()); + newContactUser.setTcSessionId(session.getId()); + dao().insert(newContactUser); + } //组成分工会 List lastDelegationUnions = dao().query(Teacher_congress_delegation_union.class, Cnd.where(Teacher_congress_delegation_union::getDelegationId, "=", lastDelegation.getId())); @@ -273,7 +293,7 @@ public class TeacherCongressSessionServiceImpl extends BaseServiceImpl lastInstitutionUsers = dao().query(Teacher_congress_institution_user.class, Cnd.where("sessionId", "=", lastSessionId)); + List lastInstitutionUsers = dao().query(Teacher_congress_institution_user.class, Cnd.where("sessionId", "=", lastSessionId).and("institutionId", "=", child.getId())); List newInstitutionUsers = lastInstitutionUsers.stream().map(institutionUser -> { Teacher_congress_institution_user teacherCongressInstitutionUser = new Teacher_congress_institution_user(); teacherCongressInstitutionUser.setUserId(institutionUser.getUserId()); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java index 4eb3737..6bbce8a 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java @@ -409,7 +409,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme if (pageForm.getBirthMonths() != null && pageForm.getBirthMonths().length > 0) { cnd.andEX("MONTH(t2.birthday)", "in", pageForm.getBirthMonths()); } - if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { + if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_WENTI_SPORTS.name())) { cnd.and("t2.unionId", "=", SecurityUtil.getUnionId()); } cnd.andEX("t1.welfareUnitId", "in", pageForm.getUnitIds()); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java index 3856182..d1a4d94 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java @@ -77,7 +77,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl unions; - if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name())) { + if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()) || AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name())|| AuthUtil.hasRole(RoleConstant.BRANCH_UNION_WENTI_SPORTS.name())) { unions = dao().query(Sys_union.class, Cnd.NEW().andEX(Sys_union::getId, "=", SecurityUtil.getUnionId()).asc(Sys_union::getUnionCode)); }else { unions = dao().query(Sys_union.class, Cnd.NEW().andEX(Sys_union::getId, "=", unionId).asc(Sys_union::getUnionCode)); diff --git a/src/main/resources/static/components/plugins/sysUpload/index.vue b/src/main/resources/static/components/plugins/sysUpload/index.vue index cd95398..31760c2 100644 --- a/src/main/resources/static/components/plugins/sysUpload/index.vue +++ b/src/main/resources/static/components/plugins/sysUpload/index.vue @@ -436,7 +436,7 @@ module.exports = { let result = [] if (response && response.code === 0 && file.status === "success") { fileList.forEach((f) => { - if(f.response.data.includes('webvpn')) { + if(f.response.data?.includes('webvpn')) { const index = f.response.data.indexOf('/platform') f.response.data = f.response.data.substring(index) } @@ -444,6 +444,7 @@ module.exports = { }) } else { this.$message.error(response.msg) + fileList = fileList.splice(file, 1) } if (result.length > 0) { if (this.upload_result_category === "interval") { @@ -475,7 +476,7 @@ module.exports = { } return } - this.$emit("update:value", null) + this.$emit("update:value", fileList) }, // 通过DOM获取上传的文件 diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html index e0f0af6..3b16110 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html @@ -14,7 +14,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js index 1e0d779..44dc781 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js @@ -1,13 +1,19 @@ const HEAD_FORM_TEMPLATE = { template: ` - + +