From 2385e57a5f146141742afe5aad4ab92fc82c3b6e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 30 六月 2025 10:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 49b59a4..7ca81c5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -58,6 +58,7 @@
insert.setRemark(category.getRemark());
insert.setStatus(Constants.ZERO);
insert.setSortnum(category.getSortnum());
+ insert.setBizType(category.getBizType());
insert.setImgurl(category.getImgurl());
insert.setType(category.getType());
insert.setParentId(category.getParentId());
@@ -105,6 +106,7 @@
//娓呯┖鍏朵粬璇izType灞炴��,鍙繚鐣欏綋鍓嶈褰曞敮涓�鏈夋晥
categoryMapper.update(null,new UpdateWrapper<Category>().lambda()
.set(Category::getBizType,null)
+ .eq(Category::getBizType,category.getBizType())
.ne(Category::getId,category.getId())
);
}
@@ -179,6 +181,10 @@
}
@Override
public List<Category> findChileList(Category model) {
+ if(Objects.isNull(model)){
+ model = new Category();
+ }
+ model.setIsdeleted(Constants.ZERO);
List<Category> list =findList(model);
List<Category> data = new ArrayList<>();
if(list!=null){
@@ -191,6 +197,8 @@
category.setGroupName( category.getParentName()+"/"+category.getName());
data.add(category);
}
+ }else{
+ data.add(category);
}
}
}
--
Gitblit v1.9.3