From b6449621674069409bfd2341e417f27575f50d8c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Sep 2021 19:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
index ab7bf88..71a159f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
@@ -27,7 +27,7 @@
@Override
public IPage<MallGoodsCategory> getCategoryList(MallGoodsCategory mallGoodsCategory, QueryRequest request) {
Page<MallGoodsCategory> page = new Page<>(request.getPageNum(), request.getPageSize());
- IPage<MallGoodsCategory> mallGoodsCategorys = this.baseMapper.selectCategoryList(page, mallGoodsCategory);
+ IPage<MallGoodsCategory> mallGoodsCategorys = this.baseMapper.selectCategoryListInPage(page, mallGoodsCategory);
return mallGoodsCategorys;
}
@@ -44,11 +44,18 @@
MallGoodsCategory goodsCategory = new MallGoodsCategory();
goodsCategory.setName(name);
+ goodsCategory.setIsComand(mallGoodsCategory.getIsComand());
if(ObjectUtil.isNotEmpty(mallGoodsCategory.getParentId())){
Long parentId = mallGoodsCategory.getParentId();
MallGoodsCategory mallGoodsCategoryParent = mallGoodsCategoryMapper.selectById(parentId);
goodsCategory.setParentId(mallGoodsCategory.getParentId());
-// goodsCategory.setParentIds(mallGoodsCategoryParent.getParentIds()+mallGoodsCategory.getParentId()+",");
+ if(StrUtil.isNotEmpty(mallGoodsCategoryParent.getParentIds())){
+ goodsCategory.setParentIds(mallGoodsCategoryParent.getParentIds()+","+mallGoodsCategory.getParentId()+",");
+ }else{
+ goodsCategory.setParentIds(mallGoodsCategory.getParentId()+",");
+ }
+ }else{
+ goodsCategory.setParentId(0L);
}
mallGoodsCategoryMapper.insert(goodsCategory);
return new FebsResponse().success();
--
Gitblit v1.9.1