From 8306e15e0bc083e6a379e9bd3ef31761651f43ce Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 20 Apr 2026 15:38:41 +0800 Subject: [PATCH] commit --- .../app/sys/controller/SysUnitController.java | 2 +- .../impl/AssetStocktakingServiceImpl.java | 1 + .../MemberBranchUnionAuditController.java | 2 +- .../change/MemberChangeApplyController.java | 18 +++++++++++------- .../change/MemberChangeMineController.java | 3 +-- .../MemberSchoolUnionAuditController.java | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysUnitController.java b/src/main/java/com/budwk/app/sys/controller/SysUnitController.java index 7f515c8..63cfdda 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysUnitController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysUnitController.java @@ -295,7 +295,7 @@ public class SysUnitController { nodeList.add(new TreeNode<>(list.get(i).getId(), list.get(i).getParentId(), list.get(i).getName(), i) .setExtra( Map.of( - "unitType", list.get(i).getUnitType(), +// "unitType", list.get(i).getUnitType(), "unitTypeCode", list.get(i).getUnitTypeCode() ) )); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java index 6ff7f2d..074cf22 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java @@ -55,6 +55,7 @@ public class AssetStocktakingServiceImpl extends BaseServiceImpl" : "=") + "0"); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberBranchUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberBranchUnionAuditController.java index 6cac513..2876070 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberBranchUnionAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberBranchUnionAuditController.java @@ -99,7 +99,7 @@ public class MemberBranchUnionAuditController { Cnd cnd = Cnd.NEW(); pageForm.buildSearch(cnd, "info."); - cnd.and("t.taskName", "=", "64805be3-b325-4c25-a516-d0c4e4a87509"); + cnd.and("t.taskName", "=", "8ca3bcf0-7b86-4ef2-b19f-b76a1707e2da"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); if (pageForm.getAudit()) { 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 7ccb8c9..af656d0 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 @@ -74,7 +74,7 @@ public class MemberChangeApplyController { @At @ApiOperation("保存申请") - @SaCheckPermission("member.apply.submit") + @SaCheckPermission("member.change.apply") @SLog(tag = "会员变更申请", msg = "保存申请,申请人: ${args[0].username}") public Result save(@Param("data") MemberChangeRecord memberChangeRecord) { if (StrUtil.isBlank(memberChangeRecord.getId())) { @@ -90,7 +90,7 @@ public class MemberChangeApplyController { @At @ApiOperation("提交申请") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.apply.submit") + @SaCheckPermission("member.change.apply") @SLog(tag = "会员变更申请", msg = "提交申请,申请人: ${args[0].username}") public Result submit(@Param("data") MemberChangeRecord memberChangeRecord){ if (StrUtil.isBlank(memberChangeRecord.getId())) { @@ -107,9 +107,11 @@ public class MemberChangeApplyController { // .and(new Static("JSON_CONTAINS(unitIds, '\"%s\"')".formatted(SecurityUtil.getUnitId())))); // args.set("submit", Lang.isEmpty(group) ? "singleBranch" : "singleHaveGroup"); - if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) { + if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { args.set("origin", "schoolUnion"); - }else { + } else if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { + args.set("origin", "branchUnion"); + } else { args.set("origin", "person"); } @@ -129,7 +131,7 @@ public class MemberChangeApplyController { @At @ApiOperation("重新提交申请") @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.apply.submit") + @SaCheckPermission("member.change.apply") @SLog(tag = "会员变更申请", msg = "重新提交申请,申请人: ${args[0].username}") public Result submitAgain(@Param("data") MemberChangeRecord memberChangeRecord, @Param("taskId") Long taskId) { if (StrUtil.isBlank(memberChangeRecord.getId())) { @@ -144,9 +146,11 @@ public class MemberChangeApplyController { // Sys_union_group group = dao.fetch(Sys_union_group.class, Cnd.where(Sys_union_group::getUnionId, "=", SecurityUtil.getUnionId()) // .and(new Static("JSON_CONTAINS(unitIds, '\"%s\"')".formatted(SecurityUtil.getUnitId())))); // dict.set("submit", Lang.isEmpty(group) ? "singleBranch" : "singleHaveGroup"); - if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) { + if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { dict.set("origin", "schoolUnion"); - }else { + } else if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { + dict.set("origin", "branchUnion"); + } else { dict.set("origin", "person"); } dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java index 8dbe211..d2f2acf 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeMineController.java @@ -145,10 +145,8 @@ public class MemberChangeMineController { return Result.success(); } - @At @ApiOperation("根据id查询变更记录") - @SaCheckPermission(value = {"member.change.mine", "member.change.unionGroup.audit"}, mode = SaMode.OR) public Result findMemberChangeRecord(String id){ MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id); NutMap nutMap = Lang.obj2nutmap(record); @@ -157,4 +155,5 @@ public class MemberChangeMineController { nutMap.put("changeInfos", changeInfos); return Result.success().addData(nutMap); } + } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberSchoolUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberSchoolUnionAuditController.java index 029eb5c..8c03098 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberSchoolUnionAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberSchoolUnionAuditController.java @@ -127,7 +127,7 @@ public class MemberSchoolUnionAuditController { Cnd cnd = Cnd.NEW(); pageForm.buildSearch(cnd, "info."); - cnd.and("t.taskName", "=", "55f85ecd-7aab-4ba9-a8ec-f256839947f0"); + cnd.and("t.taskName", "=", "f18d8726-75bc-43a9-87a8-2dd73341bdce"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); if (pageForm.getAudit()) {