From a76f7b29357729710f9e99f0676af4635b922ea4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 10 九月 2026 11:41:55 +0800
Subject: [PATCH] fix: 更新产品导入的工作表名称
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 bd46fb4..cf2e3d9 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -51,7 +51,7 @@
private final TechnologyBomMapper technologyBomMapper;
private ProductModelMapper productModelMapper;
- private static final List<String> IMPORT_SHEET_NAMES = Arrays.asList("鍘熸枡", "鍗婃垚鍝�", "鎴愬搧");
+ private static final List<String> IMPORT_SHEET_NAMES = Arrays.asList("鍘熸潗鏂�", "鍘熸枡", "鍗婃垚鍝�", "鎴愬搧");
@Override
public int addOrEditProductModel(ProductModelDto productModelDto) {
@@ -162,23 +162,22 @@
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 parentNodeId = topId;
+ Long currentParentId = topId;
if (parentName != null) {
path = path + ">" + parentName;
- parentNodeId = ensureChildNode(nodeCache, path, parentNodeId, parentName);
+ currentParentId = ensureChildNode(nodeCache, path, currentParentId, parentName);
}
- path = path + ">" + categoryName;
- Long categoryId = ensureChildNode(nodeCache, path, parentNodeId, categoryName);
+ if (categoryName != null) {
+ path = path + ">" + categoryName;
+ currentParentId = ensureChildNode(nodeCache, path, currentParentId, categoryName);
+ }
path = path + ">" + productName;
- Long leafId = ensureChildNode(nodeCache, path, categoryId, productName);
+ Long leafId = ensureChildNode(nodeCache, path, currentParentId, productName);
String code = trimToNull(row.getProductCode());
if (code == null) {
--
Gitblit v1.9.3