From 1690d4d06b0c20b3606e50e0844ef67e07947a0d Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 14:05:59 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index c966372..b4fab11 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
import io.swagger.annotations.Api;
@@ -26,8 +28,8 @@
*/
@RestController
@RequestMapping("/goods-category")
-@Api(tags = "商品分类")
-public class GoodsCategoryController {
+@Api("商品分类")
+public class GoodsCategoryController extends BaseController {
@Resource
private GoodsCategoryService goodsCategoryService;
@@ -60,10 +62,11 @@
@ApiImplicitParam(name = "current", value = "当前页码，从1开始", required = true, dataType = "Integer", paramType = "query"),
@ApiImplicitParam(name = "size", value = "每页显示数量，默认10", dataType = "Integer", paramType = "query")
})
- public R<IPage<GoodsCategory>> list(IPage<GoodsCategory> page, GoodsCategory goodsCategory){
- IPage<GoodsCategory> iPage = goodsCategoryService.page(page, new LambdaQueryWrapper<GoodsCategory>()
+ public R<TableDataInfo<GoodsCategory>> list(IPage<GoodsCategory> page, GoodsCategory goodsCategory){
+ startPage();
+ List<GoodsCategory> list = goodsCategoryService.list(new LambdaQueryWrapper<GoodsCategory>()
.eq(StringUtils.isNotEmpty(goodsCategory.getName()), GoodsCategory::getName, goodsCategory.getName()));
- return R.ok(iPage);
+ return R.ok(getDataTable(list));
}
@GetMapping("/index/list")
@@ -72,8 +75,7 @@
List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
.orderByDesc(GoodsCategory::getCreateTime)
.last("limit 8")
- .list()
- ;
+ .list();
return R.ok(indexlist);
}
@GetMapping("/list")
--
Gitblit v1.7.1