修改bug

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -154,7 +154,7 @@ public class GoodsDesc implements Serializable {
 	private List<GoodsPrice>  saleGoodsPrice;
 
 	@TableField(exist = false)
-	private List<GoodsPrice>  bugGoodsPrice;
+	private List<GoodsPrice>  buyGoodsPrice;
 
 	@TableField(exist = false)
 	private List<GoodsFiles> filesList;

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsPrice.java

@@ -86,6 +86,8 @@ public class GoodsPrice implements Serializable {
 	@TableLogic
 	private Integer isDeleted;
 
+    //供应商
+	private String corpName;
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -100,12 +100,13 @@ public class GoodsDescController extends BladeController {
 	public R<?> list(@RequestParam(name = "current", defaultValue = "1") Integer current,
 					 @RequestParam(name = "size", defaultValue = "10") Integer size,
 					 @RequestParam(name = "cname", required = false) String cname,
-					 @RequestParam(name = "code", required = false) String code
-
+					 @RequestParam(name = "code", required = false) String code,
+					 @RequestParam(name = "goodsTypeId", required = false) String goodsTypeId
 					 )
 	{
 		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		goodsDescLambdaQueryWrapper
+			.eq(!StringUtils.isBlank(goodsTypeId),GoodsDesc::getGoodsTypeId,goodsTypeId)
 			.like(!StringUtils.isBlank(cname),GoodsDesc::getCname,cname)
 			.like(!StringUtils.isBlank(code),GoodsDesc::getCode,code)
 			.eq(GoodsDesc::getTenantId,AuthUtil.getTenantId())
@@ -134,7 +135,7 @@ public class GoodsDescController extends BladeController {
 			List<GoodsPrice> sale = priceList.stream().filter(e -> e.getBillType().equals("0")).collect(Collectors.toList());
 			List<GoodsPrice> buy = priceList.stream().filter(e -> e.getBillType().equals("1")).collect(Collectors.toList());
 			goodsDesc.setSaleGoodsPrice(sale);
-			goodsDesc.setBugGoodsPrice(buy);
+			goodsDesc.setBuyGoodsPrice(buy);
 			goodsDesc.setFilesList(filesList);
 		}
 		return R.data(goodsDesc);

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -179,8 +179,16 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	{
 		List<GoodsFiles> filesList = goodsDesc.getFilesList();
 		List<GoodsPrice> chilList=new ArrayList<>();
-		chilList.addAll(goodsDesc.getBugGoodsPrice());
-		chilList.addAll(goodsDesc.getSaleGoodsPrice());
+		if(CollectionUtils.isNotEmpty(goodsDesc.getBuyGoodsPrice()))
+		{
+			chilList.addAll(goodsDesc.getBuyGoodsPrice());
+		}
+		if(CollectionUtils.isNotEmpty(goodsDesc.getSaleGoodsPrice()))
+		{
+			chilList.addAll(goodsDesc.getSaleGoodsPrice());
+		}
+
+
 		Long id = goodsDesc.getId();
 		//代表主表、子表都是新增,
 		if(id==null)