diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java index a8f92ff1..691f6da7 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/union/controller/OutlayManageUnionController.java @@ -52,14 +52,18 @@ public class OutlayManageUnionController { @At @ApiOperation("分页查询") @SaCheckPermission("outlay.outlayManage.union.manage") - public Result pageData(PageForm pageForm, Integer year) { + public Result pageData(PageForm pageForm, + Integer year, + String unionId) { Cnd cnd = Cnd.NEW(); Sql sql = Sqls.create(""" SELECT * FROM `outlay_manage_union` $condition """); cnd.andEX("year", "=", year); - if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - cnd.andEX("unionId", "=", SecurityUtil.getUnionId()); + if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + cnd.andEX("unionId", "=", unionId); + } else { + cnd.and("unionId", "=", SecurityUtil.getUnionId()); } cnd.asc("unionCode"); sql.setCondition(cnd); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java index ec1234e4..f46a612a 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/interceptor/UnionReimburseFundSourceInterceptor.java @@ -105,8 +105,11 @@ public class UnionReimburseFundSourceInterceptor implements FlowInterceptor { } } else { - // 处理未知的经费来源类型 - throw new BaseException("不支持的经费来源类型: " + reimburseFundSource); + if (reimburseFundSource == null) { + throw new BaseException("经费来源类型不能为空"); + } else { + throw new BaseException("不支持的经费来源类型: " + reimburseFundSource); + } } } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html index 59bae9bb..3341e7df 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayManage/union/manage/index.html @@ -20,6 +20,18 @@ layout("/layouts/platform.html"){ value-format="yyyy"> + + + + + @@ -102,7 +114,8 @@ layout("/layouts/platform.html"){ pageForm: { year: this.$moment().format("YYYY") }, - isAllocation: false + isAllocation: false, + unions: [] } }, components: {}, @@ -170,6 +183,7 @@ layout("/layouts/platform.html"){ } }, async created() { + this.unions = await this.$businessTool.listUnion() this.getIsAllocation() this.pageData() } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html index 8ba2a2f1..d6b1303e 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html @@ -555,7 +555,7 @@ layout("/layouts/platform.html"){ this.queryCondolenceType() this.init() //社团查询 - this.$businessTool.listClub().then((res) => (this.clubOptions = res)) + this.$businessTool.listCLubByRole().then((res) => (this.clubOptions = res)) } }) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html index 4588ec38..65f8fdaf 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html @@ -60,7 +60,7 @@ layout("/layouts/platform.html"){ - + - +