From 2a8241df4493a36b046855f2283b1c3da9e6bfbe Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 18:37:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 e5ea7b9..59a522d 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
@@ -61,7 +61,7 @@
BaseCategory baseCategory1 = baseCategoryMapper.selectOne(wrapper);
if (Objects.nonNull(baseCategory1)){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍝佺被淇℃伅琛�");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍝佺被淇℃伅宸插瓨鍦�");
}
BaseCategory baseCategory2 = new BaseCategory();
baseCategory2.setCreator(loginUserInfo.getId());
@@ -257,13 +257,16 @@
@Override
public List<BaseCategory> findList(BaseCategory baseCategory) {
+ baseCategory.setIsdeleted(Constants.ZERO);
QueryWrapper<BaseCategory> wrapper = new QueryWrapper<>(baseCategory);
List<BaseCategory> list = baseCategoryMapper.selectList(wrapper);
list.forEach(i->{
- i.setImgfullurl(
- systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
- systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_IMG).getCode() + i.getImgurl()
- );
+ if(StringUtils.isNotBlank(i.getImgurl())){
+ i.setImgfullurl(
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_IMG).getCode() + i.getImgurl()
+ );
+ }
});
return list;
}
--
Gitblit v1.9.3