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 ccce3b9ce..ad2174569 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 @@ -859,20 +859,26 @@ public class EmisBaseService { queryEmisQuotePrice.setCustNo(custNo); Map existsMap = new HashMap(); + List listQuoteValid = new ArrayList<>(); // 客户优先级最高 List listQuoteVip = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice); for (EmisQuotePrice item:listQuoteVip) { existsMap.put(item.getFeeType(),"1"); + listQuoteValid.add(item); } // 取通用数据排重 + queryEmisQuotePrice.setCustomerCode(null); + queryEmisQuotePrice.setCustNo(null); List listQuote = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice); for (EmisQuotePrice item:listQuote) { if(existsMap.containsKey(item.getFeeType())){ continue; + }else{ + listQuoteValid.add(item); } } - return listQuote; + return listQuoteValid; }