From eb7613c000b6c794bb7cb1d47c138be7e790f57d Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 18 Oct 2022 15:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BF=9D=E5=AD=98=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml | 2 +-
 .../base/biz/basemanufacturer/BaseManufacturerService.java     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
index bdbe863428..df1323a4b5 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
@@ -287,7 +287,7 @@
         from base_manufacturer
         where createOrg = #{orgSid}
           and manBankSid = #{mankSid}
-          and supplyTypeValue = #{type}
+          and supplierTypeValue = #{type}
         AND isDelete = 0
     </select>
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
index 69958ae26a..0d14d0914b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
@@ -466,6 +466,9 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         String manBankSid = baseVehicleBrandService.selectByManufacturerSid(carBrandSid);
         if (StringUtils.isNotBlank(manBankSid)) {
             vo = baseMapper.getManufacturerSidAndSupplierSid(manBankSid, useOrgSid);
+            if(vo == null){
+                vo = new BaseManufacturerSidVo();
+            }
             vo.setManufacturerSid(manBankSid);
         }
         return rb.success().setData(vo);