diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
index 86587925..90d1561a 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
@@ -241,9 +241,10 @@ public class CommodityServiceImpl implements CommodityService {
                 }
                 map1.put("productName", xmmc);
                 map1.put("zxbm", zxbm);
+                map1.put("entId",commodityCodeCheckQuery.getDeptId());
 
                 log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map1);
-                List<CommodityCodeEntity> commodityCodeEntityList = commodityMapper.queryProductList(map1, shList);
+                List<CommodityCodeEntity> commodityCodeEntityList = commodityMapper.queryProductList(map1, null);
 				/*
 				如果返回数组中没有数据,直接返回校验通过
 				如果返回数组中数据大于0,需要判断传递的id和查询结果的id是否一致
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
index adf87000..43737924 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
@@ -140,7 +140,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                     buyerManageIds.add(buyerEntity.getId());
                 }
                 buyerMapper.batchDeleteBuyerDetail(buyerManageIds);
-                buyerMapper.batchInsertBuyerDetail(buyerEntityDetail);
+                if(buyerEntityDetail.size()>0){
+                    buyerMapper.batchInsertBuyerDetail(buyerEntityDetail);
+                }
 
                 if (buyerMapper.batchUpdateBuyer(entity, null,buyerManageIds) > 0) {
                     entity.setSuccess(true);
@@ -172,8 +174,8 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                 // entity.setMdmMulticodeJson(JsonUtils.getInstance().toJsonStringNullToEmpty());
                 entity.setUUID(tempMdmGmfxxtbReqBO.getUUID());
                 entity.setStatus("1");
+                buyerMapper.deleteBuyerDetail(entity.getId());
                 if(entity.getBuyerEntityDetail() != null && entity.getBuyerEntityDetail().size()>0){
-                    buyerMapper.deleteBuyerDetail(entity.getId());
                     buyerMapper.batchInsertBuyerDetail(entity.getBuyerEntityDetail());
                 }
                 if (buyerMapper.insertBuyerOnDuplicateKey(entity) > 0) {