From e0ea1f4a21321f145be79556896181f23f22b708 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 29 八月 2024 09:33:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java b/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
index c1d7c32..3000ec0 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mzl.flower.base.Node;
import com.mzl.flower.base.cache.CategoryPriceCacheClient;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
@@ -69,8 +70,9 @@
public Long updateCategory(FlowerCategoryUpdateDTO dto){
Long id = dto.getId();
FlowerCategory g = categoryMapper.selectById(id);
-
+ Boolean shown = g.getShown();
BeanUtils.copyProperties(dto, g);
+ g.setShown(shown);
g.setSortBy(dto.getSortBy() == null ? 0 : dto.getSortBy());
g.update(SecurityUtils.getUserId());
@@ -120,6 +122,19 @@
public List<FlowerCategoryTreeDTO> selectCategoryTree(FlowerCategoryQueryDTO dto) {
List<FlowerCategoryTreeDTO> treeList = categoryMapper.selectTreeList(dto);
treeList = (List<FlowerCategoryTreeDTO>) TreeBuilderUtil.buildListToTree(treeList);
+ if(treeList != null && treeList.size() > 0){
+ for(FlowerCategoryTreeDTO t : treeList){
+ List<Node> cLs = t.getChildren();
+ String ll = t.getLevelLimit();
+ if(cLs != null && cLs.size() > 0){
+ for(Node c : cLs){
+ FlowerCategoryTreeDTO cc = (FlowerCategoryTreeDTO)c;
+ cc.setLevelLimit(ll);
+ }
+ }
+ }
+ }
+
return treeList;
}
--
Gitblit v1.9.3