bug整改

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

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