From 99626fbbfeb8e8854c35fb9453d75d8dcbea1320 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Thu, 6 Jun 2024 10:33:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BB=B7=E6=A0=BC=E4=BD=93=E7=B3=BB=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/service/impl/BasicdataPriceServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
index 395ccf6d5..0153e2ce0 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
@@ -3351,6 +3351,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 								  Map<String, BasicdataBrandEntity> brandEntityMap, Map<String, BasicdataPriceEntity> priceEntityMap,
 								  Map<String, BasicdataStoreBrandEntity> clientBrandMap, Map<String, List<BasicdataPriceEntity>> checkPriceEntityMap) {
 		if (CollUtil.isNotEmpty(priceExcels)) {
+			Map<String,String> checkRepeatMap = new HashMap<>();
 			for (int i = 0; i < priceExcels.size(); i++) {
 				StringBuilder rowMessage = new StringBuilder();
 				int rowNum = i + 2;
@@ -3377,6 +3378,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 						brandFlag = Boolean.TRUE;
 					}
 				}
+				checkRepeatMap.put(priceExcel.getClient() + priceExcel.getBrand(),priceExcel.getClient() + priceExcel.getBrand());
 				Boolean templateFlag = Boolean.FALSE;
 				if (StrUtil.isEmpty(priceExcel.getTemplateName())) {
 					rowMessage.append("模板名称不能为空；");
@@ -3465,7 +3467,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				buildErrorMessageExcel(message, rowMessage, firstMessage);
 			}
 			if (StrUtil.isEmpty(message.toString())) {
-				if (CollUtil.isNotEmpty(priceEntityMap) && !ObjectUtil.equal(priceExcels.size(), clientBrandMap.size())) {
+				if (CollUtil.isNotEmpty(checkRepeatMap) && !ObjectUtil.equal(priceExcels.size(), checkRepeatMap.size())) {
 					message.append(sheet1).append("中存在 客户名称+品牌 重复的数据，请检查；");
 				}
 			}