From afbc1b29cd2ce92484f1be1e533ee075dbe08ff2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 10 十月 2022 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
index 33b9652..bd15859 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.store.StoreInfo;
@@ -17,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -32,14 +34,16 @@
@Slf4j
public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo> implements StoreInfoService {
+
+
@Override
public Page<StoreInfo> list(String keyword, Integer pageSize, Integer pageNum) {
Page<StoreInfo> page = new Page<>(pageSize, pageNum);
- LambdaQueryWrapper<StoreInfo> wrapper = new LambdaQueryWrapper<>();
- if (StrUtil.isNotEmpty(keyword)) {
- wrapper.like(StoreInfo::getStoreName, keyword);
- }
- return page(page, wrapper);
+ Page<StoreInfo> storeInfoPage = page(page, new LambdaQueryWrapper<StoreInfo>()
+ .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword));
+ storeInfoPage.setRecords(list(new LambdaQueryWrapper<StoreInfo>()
+ .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword)));
+ return storeInfoPage;
}
@Override
--
Gitblit v1.8.0