From 7045cdea35dbb2cd59af911a44c54047eee89375 Mon Sep 17 00:00:00 2001
From: chenchuchuan <13554600537@163.com>
Date: Tue, 28 Jul 2026 15:19:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(controller):=20=E4=BF=AE=E5=A4=8D=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=95=B0=E6=8D=AE=E8=A7=84=E5=88=99=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E4=B8=AD=E7=9A=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=92=8C=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为delete方法的id参数添加@MyRequestBody注解以确保正确绑定请求体参数
- 在getListByFilter方法中添加对filter对象的空值检查和初始化
- 防止当filter参数为null时可能出现的空指针异常
- 优化代码格式和方法签名的换行显示
---
 .../tenant/controller/PermissionDataRuleSchemaController.java | 11 ++++++-----
 .../service/impl/PermissionDataRuleSchemaServiceImpl.java     |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/PermissionDataRuleSchemaController.java b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/PermissionDataRuleSchemaController.java
index 8ebce59..c09e114 100644
--- a/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/PermissionDataRuleSchemaController.java
+++ b/application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/tenant/controller/PermissionDataRuleSchemaController.java
@@ -104,7 +104,7 @@ public class PermissionDataRuleSchemaController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<?> delete(@RequestBody Long id) {
+    public ResponseResult<?> delete(@MyRequestBody Long id) {
         if (MyCommonUtil.existBlankArgument(id)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -140,10 +140,11 @@ public class PermissionDataRuleSchemaController {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
-        List<PermissionDataRuleSchema> list = service.getListByFilter(
-                filter, MyOrderParam.buildOrderBy(orderParam, PermissionDataRuleSchema.class));
-        return ResponseResult.success(MyPageUtil.makeResponseData(
-                list, PermissionDataRuleSchema.INSTANCE));
+        if (filter == null){
+            filter = new PermissionDataRuleSchema();
+        }
+        List<PermissionDataRuleSchema> list = service.getListByFilter(filter, MyOrderParam.buildOrderBy(orderParam, PermissionDataRuleSchema.class));
+        return ResponseResult.success(MyPageUtil.makeResponseData(list, PermissionDataRuleSchema.INSTANCE));
     }
 
     // ========== 根据 formId 查询启用的规则（运行时用） ==========
diff --git a/common/common-online/src/main/java/apelet/common/online/service/impl/PermissionDataRuleSchemaServiceImpl.java b/common/common-online/src/main/java/apelet/common/online/service/impl/PermissionDataRuleSchemaServiceImpl.java
index 53eeac1..78c673f 100644
--- a/common/common-online/src/main/java/apelet/common/online/service/impl/PermissionDataRuleSchemaServiceImpl.java
+++ b/common/common-online/src/main/java/apelet/common/online/service/impl/PermissionDataRuleSchemaServiceImpl.java
@@ -44,8 +44,7 @@ public class PermissionDataRuleSchemaServiceImpl extends BaseService<PermissionD
 
     // ========== 分页查询 ==========
     @Override
-    public List<PermissionDataRuleSchema> getListByFilter(
-            PermissionDataRuleSchema filter, String orderBy) {
+    public List<PermissionDataRuleSchema> getListByFilter(PermissionDataRuleSchema filter, String orderBy) {
         return mapper.getListByFilter(filter, orderBy);
     }