From a4b2acdd6424ed1f5771a94ee380972dbffade45 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 九月 2023 12:19:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
index 59a522d..2068a13 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
@@ -257,8 +257,9 @@
@Override
public List<BaseCategory> findList(BaseCategory baseCategory) {
- baseCategory.setIsdeleted(Constants.ZERO);
QueryWrapper<BaseCategory> wrapper = new QueryWrapper<>(baseCategory);
+ wrapper.eq("ISDELETED",Constants.ZERO);
+ wrapper.eq("STATUS",Constants.ZERO);
List<BaseCategory> list = baseCategoryMapper.selectList(wrapper);
list.forEach(i->{
if(StringUtils.isNotBlank(i.getImgurl())){
@@ -326,8 +327,9 @@
queryWrapper.lambda().orderByAsc(BaseCategory::getSortnum);
IPage<BaseCategory> baseCategoryIPage = baseCategoryMapper.selectPage(page, queryWrapper);
+ String preUrl = getPreUrl();
if (!CollectionUtils.isEmpty(baseCategoryIPage.getRecords())){
- baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(getPreUrl()+s.getImgurl()));
+ baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(preUrl+s.getImgurl()));
}
return PageData.from(baseCategoryIPage);
--
Gitblit v1.9.3