From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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..56cf831 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())){

--
Gitblit v1.9.3