From b85fa7072dc81336600bf10a443da9e1374f40f1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 13 九月 2026 14:01:57 +0800
Subject: [PATCH] fix: 添加产品导入模板,基础产品导入修改
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 0d1f8c8..bd46fb4 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -162,22 +162,23 @@
String parentName = trimToNull(row.getProductParentName());
String categoryName = trimToNull(row.getProductCategoryName());
String productName = trimToNull(row.getProductName());
+ if (categoryName == null) {
+ throw new ServiceException("绗� " + rowNum + " 琛� [浜у搧澶х被] 涓嶈兘涓虹┖");
+ }
if (productName == null) {
throw new ServiceException("绗� " + rowNum + " 琛� [浜у搧鍚嶇О] 涓嶈兘涓虹┖");
}
String path = String.valueOf(topId);
- Long currentParentId = topId;
+ Long parentNodeId = topId;
if (parentName != null) {
path = path + ">" + parentName;
- currentParentId = ensureChildNode(nodeCache, path, currentParentId, parentName);
+ parentNodeId = ensureChildNode(nodeCache, path, parentNodeId, parentName);
}
- if (categoryName != null) {
- path = path + ">" + categoryName;
- currentParentId = ensureChildNode(nodeCache, path, currentParentId, categoryName);
- }
+ path = path + ">" + categoryName;
+ Long categoryId = ensureChildNode(nodeCache, path, parentNodeId, categoryName);
path = path + ">" + productName;
- Long leafId = ensureChildNode(nodeCache, path, currentParentId, productName);
+ Long leafId = ensureChildNode(nodeCache, path, categoryId, productName);
String code = trimToNull(row.getProductCode());
if (code == null) {
--
Gitblit v1.9.3