修改提交

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

@@ -455,11 +455,15 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				BeanUtils.copyProperties(e,goodsDesc);
 
 				R<CorpsDesc> corpByName = corpsDescClient.getCorpByName(e.getCorpName(), AuthUtil.getTenantId());
-				if(corpByName.isSuccess())
+				if(corpByName.isSuccess()&&corpByName.getData()!=null)
 				{
 					goodsDesc.setCorpName(e.getCorpName());
 					goodsDesc.setCorpId(corpByName.getData().getId());
 				}
+				else
+				{
+					throw new SecurityException("请输入正确的供应商");
+				}
 				//获取供应商
 				goodsDesc.setTypeno(e.getTypeNo());
 				goodsDesc.setCntrVolumn(e.getCntrVolumn());

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -424,6 +424,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		   baseMapper.insert(settlement);
 
 		   itemsList.forEach(e->{
+		   	   e.setId(null);
 		   	   e.setPid(settlement.getId());
 			   e.setCreateTime(new Date());
 			   e.setTenantId(AuthUtil.getTenantId());