From 0a99d31c8f724162669f0d34080e4225c5cdd97e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 31 May 2024 04:47:37 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 19 +++++++++++--------
 .../resources/mapper/EmisQuotePriceMapper.xml |  9 +++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 783e99913..54d71e821 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -916,15 +916,18 @@ public class EmisBaseService {
 
          Map existsMap = new HashMap();
          List<EmisQuotePrice> listQuoteValid = new ArrayList<>();
-         // 客户优先级最高,先查询客户特殊报价 客户
-         queryEmisQuotePrice.setQuoteType("3,4");
-         queryEmisQuotePrice.setCustomerCode(customerCode);
-         queryEmisQuotePrice.setCustNo(custNo);
 
-         List<EmisQuotePrice> listQuoteVip = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
-         for (EmisQuotePrice item:listQuoteVip) {
-             existsMap.put(item.getFeeType(),"1");
-             listQuoteValid.add(item);
+         if(!StringUtils.isEmpty(customerCode) || !StringUtils.isEmpty(custNo)) {
+             // 客户优先级最高,先查询客户特殊报价 客户
+             queryEmisQuotePrice.setQuoteType("3,4");
+             queryEmisQuotePrice.setCustomerCode(customerCode);
+             queryEmisQuotePrice.setCustNo(custNo);
+
+             List<EmisQuotePrice> listQuoteVip = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
+             for (EmisQuotePrice item : listQuoteVip) {
+                 existsMap.put(item.getFeeType(), "1");
+                 listQuoteValid.add(item);
+             }
          }
          // 取通用数据排重
          queryEmisQuotePrice.setCustomerCode(null);
diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index 7b4ce254e..cb7c78170 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -114,13 +114,14 @@
             <if test="quoteCode != null  and quoteCode != ''"> and quote_code=#{quoteCode}</if>
             <if test="transLineCode != null  and transLineCode != ''"> and trans_line_code=#{transLineCode}</if>
 
+            <if test="quoteType != null  and quoteType != ''"> and FIND_IN_SET(quote_type, #{quoteType})</if>
 
-            <if test="quoteType != null  and (quoteType == '3' or quoteType == '4' or quoteType == '3,4')">
-                and ( ( cust_no is not null and cust_no=#{custNo} ) or ( customer_code is not null and customer_code=#{customerCode}  ) )
+            <if test="customerCode != null  and customerCode != ''">
+                and customer_code=#{customerCode}
             </if>
 
-            <if test="quoteType != null  and (quoteType == '1' or quoteType == '2' or quoteType == '1,2')">
-                and  cust_no is not null and customer_code is not null
+            <if test="custNo != null  and custNo != ''">
+                and cust_no=#{custNo}
             </if>
 
             <if test="feeType != null  and feeType != ''"> and fee_type=#{feeType}</if>