轮胎商城：次日达excel导入生成不存在商品数据所属公司不对

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/share/service/impl/SharePutOnShelvesServiceImpl.java

@@ -279,7 +279,7 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 					item.setSharedCompanyId(deptItem.getId() + "");
 					item.setSharedCompany(deptItem.getDeptName());
 				}
-				List<SharePutOnShelves> sharePutOnShelvesList1 = baseMapper.selectSharePutOnShelvesList(item.getGoodsCode(), deptItem.getDeptName(),item.getSalesCompanyName(), deptItem.getTenantId());
+				List<SharePutOnShelves> sharePutOnShelvesList1 = baseMapper.selectSharePutOnShelvesList(item.getGoodsCode(), deptItem.getDeptName(), item.getSalesCompanyName(), deptItem.getTenantId());
 				if (!sharePutOnShelvesList1.isEmpty()) {
 					for (SharePutOnShelves shelves : sharePutOnShelvesList1) {
 						shelves.setInventory(item.getInventory());
@@ -754,14 +754,14 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 					if (ObjectUtils.isNotNull(item.getSharedCompanyId()) && ObjectUtils.isNotNull(item.getSharedCompany())) {
 						List<String> sharedCompanyIdList = new ArrayList<>();
 						List<String> sharedCompanyId = Arrays.asList(item.getSharedCompanyId().split(","));
-						if (!sharedCompanyId.isEmpty()){
+						if (!sharedCompanyId.isEmpty()) {
 							sharedCompanyIdList.addAll(sharedCompanyId);
 						}
 						sharedCompanyIdList.add(deptItem.getId() + "");
 						item.setSharedCompanyId(sharedCompanyIdList.stream().distinct().collect(Collectors.joining(",")));
 						List<String> sharedCompanyNameList = new ArrayList<>();
 						List<String> sharedCompanyName = Arrays.asList(item.getSharedCompany().split(","));
-						if (!sharedCompanyName.isEmpty()){
+						if (!sharedCompanyName.isEmpty()) {
 							sharedCompanyNameList.addAll(sharedCompanyName);
 						}
 						sharedCompanyNameList.add(deptItem.getDeptName());
@@ -770,7 +770,7 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 						item.setSharedCompanyId(deptItem.getId() + "");
 						item.setSharedCompany(deptItem.getDeptName());
 					}
-					List<SharePutOnShelves> sharePutOnShelvesList1 = baseMapper.selectSharePutOnShelvesList(item.getGoodsCode(), deptItem.getDeptName(),item.getSalesCompanyName(), deptItem.getTenantId());
+					List<SharePutOnShelves> sharePutOnShelvesList1 = baseMapper.selectSharePutOnShelvesList(item.getGoodsCode(), deptItem.getDeptName(), item.getSalesCompanyName(), deptItem.getTenantId());
 					if (!sharePutOnShelvesList1.isEmpty()) {
 						for (SharePutOnShelves shelves : sharePutOnShelvesList1) {
 							if (0 == shelves.getBillType() && shelves.getSharedCompany().contains(deptName)) {
@@ -829,8 +829,8 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 	}
 
 	@Override
-	public List<SharePutOnShelves> selectSharePutOnShelvesList(String goodsNo, String salesCompanyName,String srcSalesCompanyName, String tenantId) {
-		return baseMapper.selectSharePutOnShelvesList(goodsNo, salesCompanyName,srcSalesCompanyName, tenantId);
+	public List<SharePutOnShelves> selectSharePutOnShelvesList(String goodsNo, String salesCompanyName, String srcSalesCompanyName, String tenantId) {
+		return baseMapper.selectSharePutOnShelvesList(goodsNo, salesCompanyName, srcSalesCompanyName, tenantId);
 	}
 
 	@Override
@@ -873,7 +873,11 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 			.eq(PjBrandDesc::getIsDeleted, 0)
 			.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.apply("find_in_set(cname,'" + brandName + "')"));
-
+		Dept dept = null;
+		R<Dept> res = iSysClient.getDept(Long.parseLong(AuthUtil.getDeptId()));
+		if (res.isSuccess()) {
+			dept = res.getData();
+		}
 		List<PjBrandDesc> brandDescListNew = new ArrayList<>();
 		for (ShareTheNextDayDataExcel item : excelList) {
 			//品牌
@@ -942,8 +946,12 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 			goodsDesc.setSpecificationAndModel(item.getSpecificationAndModel());
 			goodsDesc.setBrandItem(item.getBrandItem());
 			goodsDesc.setEnableOrNot(1);
-			goodsDesc.setSalesCompanyId(Long.parseLong(item.getSrcSalesCompanyId()));
-			goodsDesc.setSalesCompanyName(item.getSrcSalesCompanyName());
+			if (dept != null){
+				goodsDesc.setSalesCompanyId(dept.getId());
+				goodsDesc.setSalesCompanyName(dept.getDeptName());
+			}else{
+				throw new RuntimeException("未找到所属公司");
+			}
 			goodsDesc.setWhetherIntegral("0");
 			if (!goodsDescList.isEmpty()) {
 				PjGoodsDesc goodsDetail = goodsDescList.stream().filter(e -> e.getCode().equals(item.getGoodsName())).findFirst().orElse(null);