Merge branch 'release' into test

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java

@@ -177,6 +177,7 @@ public class BuyerServiceImpl implements BuyerService {
 
             if (StringUtils.isNotEmpty(buyerEntity.getTaxpayerCode())) {
                 param.put("taxpayerCode", buyerEntity.getTaxpayerCode());
+                param.put("entId", buyerEntity.getEntId());
                 int i = buyerMapper.selectBuyerByName(param, shList);
                 if (i > 0) {
                     Map<String, String> checkResultMap1 = new HashMap<>(2);
@@ -190,6 +191,7 @@ public class BuyerServiceImpl implements BuyerService {
             if (StringUtils.isNotEmpty(buyerEntity.getPurchaseName())) {
                 param = new HashMap<>(5);
                 param.put("purchaseName", buyerEntity.getPurchaseName());
+                param.put("entId", buyerEntity.getEntId());
                 int i = buyerMapper.selectBuyerByName(param, shList);
                 if (i > 0) {
                     Map<String, String> checkResultMap1 = new HashMap<>(2);