修复食堂排序问题导致的分页重复

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));
     }
 
 

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);
 
 
     /**

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