From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
index 3f8b4dc..2d6693b 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
@@ -40,6 +40,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -97,8 +98,10 @@
private Cache cache;
@Override
- public IPage<StoreVO> findByConditionPage(StoreSearchParams storeSearchParams, PageVO page) {
- return this.baseMapper.getStoreList(PageUtil.initPage(page), storeSearchParams.queryWrapper());
+ public IPage<StoreVO> findByConditionPage(StoreSearchParams storeSearchParams, PageVO vo) {
+ Page<StoreVO> page = PageUtil.initPage(vo);
+ this.baseMapper.getStoreList(page, storeSearchParams.queryWrapper());
+ return page;
}
@Override
@@ -412,4 +415,4 @@
return this.getOne(lambdaQueryWrapper, false);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0