From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf

---
 server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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..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
@@ -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());
@@ -258,12 +258,16 @@
     @Override
     public List<BaseCategory> findList(BaseCategory baseCategory) {
         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->{
-            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;
     }
@@ -323,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