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 list = service.getListByFilter( - filter, MyOrderParam.buildOrderBy(orderParam, PermissionDataRuleSchema.class)); - return ResponseResult.success(MyPageUtil.makeResponseData( - list, PermissionDataRuleSchema.INSTANCE)); + if (filter == null){ + filter = new PermissionDataRuleSchema(); + } + List 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 getListByFilter( - PermissionDataRuleSchema filter, String orderBy) { + public List getListByFilter(PermissionDataRuleSchema filter, String orderBy) { return mapper.getListByFilter(filter, orderBy); }