commit

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()
                                 )
                         ));

src/main/java/com/budwk/app/zhgh/dayofficework/asset/service/impl/AssetStocktakingServiceImpl.java

@@ -55,6 +55,7 @@ public class AssetStocktakingServiceImpl extends BaseServiceImpl<AssetStocktakin
         }
         if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
             cnd.and("t1.assetUseUnionId", "=", SecurityUtil.getUnionId());
+            cnd.and("t1.assetTypeCode", "=", "2");
         }
         if (pageForm.getIsStocktaking() != null) {
             sql.setVar("stocktakingCnd", "HAVING COUNT(t5.assetId) " + (pageForm.getIsStocktaking() ? ">" : "=") + "0");

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()) {

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,8 +107,10 @@ 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 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,8 +146,10 @@ 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 if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+            dict.set("origin", "branchUnion");
         } else {
             dict.set("origin", "person");
         }

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);
     }
+
 }

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()) {