diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java index 0303c171e..e1feeb1e0 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java @@ -26,7 +26,7 @@ public class AppProductController { @Operation(summary = "查询商品信息列表") @PostMapping("page") - public R> page(@RequestBody ProductBo query, Page page) { + public R> page(@RequestBody ProductBo query) { IPage resultPage = service.getProduct(query.getPage(), query); return R.ok(resultPage); } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java index 53b1711b8..b306dfe39 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java @@ -63,7 +63,7 @@ public class MybatisPlusConfig { public PaginationInnerInterceptor paginationInnerInterceptor() { PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); // 分页合理化 - paginationInnerInterceptor.setOverflow(true); + paginationInnerInterceptor.setOverflow(false);//todo 2025-09-29 暂时关闭分页合理化 等app发包后改回来 return paginationInnerInterceptor; } diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml index d3aec69d8..e6a3f27b4 100644 --- a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml @@ -141,7 +141,7 @@ ON v.member_id = m.id WHERE - mlv.user_id = #{paramMap.myId} + mlv.member_id = #{paramMap.myId} AND v.status = 1 AND v.first_frame_img IS NOT NULL AND v.is_private = 0