From 8e01a0d1d5744a89abc514ccc05eca3b48b3b9f5 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 23 Apr 2025 17:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A3=9F=E5=A0=82=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/controller/CanteenSpuController.java       |  6 +-----
 .../bsd/pjcloud/canteen/service/CanteenSpuService.java |  4 ++--
 .../canteen/service/impl/CanteenSpuServiceImpl.java    | 10 ++++++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
index 5f2f7033e..bc238cb9f 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
@@ -54,11 +54,7 @@ public class CanteenSpuController {
     @GetMapping("/page")
     @PreAuthorize("@pms.hasPermission('canteen_canteenSpu_view')")
     public R getCanteenSpuPage(@ParameterObject Page page, @ParameterObject CanteenSpuEntity canteenSpu) {
-        LambdaQueryWrapper<CanteenSpuEntity> wrapper = Wrappers.lambdaQuery();
-        wrapper.like(StrUtil.isNotBlank(canteenSpu.getName()), CanteenSpuEntity::getName, canteenSpu.getName());
-        wrapper.eq(Objects.nonNull(canteenSpu.getCategoryId()), CanteenSpuEntity::getCategoryId, canteenSpu.getCategoryId());
-        wrapper.orderByAsc(CanteenSpuEntity::getSort);
-        return R.ok(canteenSpuService.pageScope(page, wrapper));
+        return R.ok(canteenSpuService.pageScope(page, canteenSpu));
     }
 
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java
index fdb3acefd..613151372 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java
@@ -38,10 +38,10 @@ public interface CanteenSpuService extends IService<CanteenSpuEntity> {
     /**
      * 分页查询
      * @param page
-     * @param wrapper
+     * @param
      * @return
      */
-    Object pageScope(Page page, LambdaQueryWrapper<CanteenSpuEntity> wrapper);
+    Object pageScope(Page page, CanteenSpuEntity canteenSpu);
 
 
     /**
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
index 805ebbd44..55482a806 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
@@ -95,8 +95,14 @@ public class CanteenSpuServiceImpl extends ServiceImpl<CanteenSpuMapper, Canteen
     }
 
     @Override
-    public Object pageScope(Page page, LambdaQueryWrapper<CanteenSpuEntity> wrapper) {
-        return baseMapper.selectPageByScope(page, wrapper, DataScope.of());
+    public Object pageScope(Page page, CanteenSpuEntity canteenSpu) {
+        LambdaQueryWrapper<CanteenSpuEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(StrUtil.isNotBlank(canteenSpu.getName()), CanteenSpuEntity::getName, canteenSpu.getName());
+        wrapper.eq(Objects.nonNull(canteenSpu.getCategoryId()), CanteenSpuEntity::getCategoryId, canteenSpu.getCategoryId());
+        wrapper.orderByAsc(CanteenSpuEntity::getSort).orderByDesc(CanteenSpuEntity::getId);
+
+        Page pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of());
+        return pageData;
     }
 
     @Override