解决api 调用依赖

blade-service/blade-sales-part/pom.xml

@@ -50,14 +50,14 @@
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-excel</artifactId>
+            <artifactId>blade-sales-part-api</artifactId>
+            <version>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-sales-part-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
+            <artifactId>blade-starter-excel</artifactId>
         </dependency>
+
     </dependencies>
 
     <properties>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsTypeServiceImpl.java

@@ -116,7 +116,9 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, CorpsType
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
+
 		return ForestNodeMerger.merge(baseMapper.tree(tenantId, corpType));
+
 	}
 
 	@Override

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -18,27 +18,26 @@ package org.springblade.salesPart.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
 import org.springblade.salesPart.entity.*;
 import org.springblade.salesPart.excel.GoodsExcel;
+import org.springblade.salesPart.goods.mapper.GoodsDescMapper;
 import org.springblade.salesPart.goods.mapper.GoodsTypeDescMapper;
 import org.springblade.salesPart.goods.mapper.GoodsTypeMapper;
+import org.springblade.salesPart.goods.service.IGoodsDescService;
 import org.springblade.salesPart.goods.service.IGoodsFilesService;
 import org.springblade.salesPart.vo.GoodsDescVO;
-import org.springblade.salesPart.goods.mapper.GoodsDescMapper;
-import org.springblade.salesPart.goods.service.IGoodsDescService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
@@ -165,7 +164,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				goodsDesc.setGoodsTypeId(String.valueOf(goodsType.getId()));
 				goodsDesc.setGoodsTypeName(e.getGoodsTypeName());
 				goodsDesc.setUnit(e.getUnit());
-				//goodsDesc.setBrand(e.getBrand());
+				goodsDesc.setBrandName(e.getBrand());
 				goodsDesc.setSpecificationAndModel(e.getSpecificationAndModel());
 				goodsDesc.setBrandItem(e.getBrandItem());
 				goodsDesc.setPlaceProduction(e.getPlaceProduction());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsTypeServiceImpl.java

@@ -25,7 +25,6 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.salesPart.entity.GoodsType;
@@ -86,7 +85,8 @@ public class GoodsTypeServiceImpl extends ServiceImpl<GoodsTypeMapper, GoodsType
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		return ForestNodeMerger.merge(baseMapper.tree(tenantId, type));
+		return null;
+		//return ForestNodeMerger.merge(baseMapper.tree(tenantId, type));
 	}
 
 	@Override

blade-service/pom.xml

@@ -101,11 +101,6 @@
             <artifactId>blade-scope-api</artifactId>
             <version>2.8.2.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-sales-part-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-        </dependency>
     </dependencies>
 
 </project>