From c8de296e439889a2f1a2562e4396b65096723d34 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 20 Sep 2024 15:36:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E7=89=A9=E6=B5=81=E9=99=90=E5=88=B6=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/BasicdataFactoryCategoryImporter.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
index d4413e643..d1961a497 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
@@ -94,7 +94,7 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 			String equalString = buildEqualString(allBasicdataFactoryCategoryEntity);
 			String equalString2 = buildEqualString2(datum);
 			if (equalString2.equals(equalString)) {
-				throw new ServiceException("品牌:" + datum.getBrand() + " 品类：" + datum.getCategory() + "已存在相同的配置内容");
+				throw new CustomerException("品牌:" + datum.getBrand() + " 品类：" + datum.getCategory() + "已存在相同的配置内容");
 			}
 		}
 
@@ -126,6 +126,12 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 		} else {
 			stringBuffer.append("-");
 		}
+
+		if (ObjectUtil.isNotEmpty(allBasicdataFactoryCategoryEntity.getMaterielName())) {
+			stringBuffer.append(allBasicdataFactoryCategoryEntity.getMaterielName());
+		} else {
+			stringBuffer.append("-");
+		}
 		return stringBuffer.toString();
 
 	}
@@ -155,6 +161,13 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 		} else {
 			stringBuffer.append("-");
 		}
+		if (ObjectUtil.isNotEmpty(datum.getMaterielName())) {
+			stringBuffer.append(datum.getMaterielName());
+		} else {
+			stringBuffer.append("-");
+		}
+
+
 		return stringBuffer.toString();
 
 	}