From 98cc1792cfcad5c3abdcf515d736388f38ad07ac Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 09 五月 2026 16:36:44 +0800
Subject: [PATCH] fix:1.产品导入导出
---
src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java | 3 +++
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
index c8c838a..4e5688f 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
@@ -15,6 +15,9 @@
@Data
public class ProductModelExportDto {
+ @Excel(name = "浜у搧缂栫爜")
+ private String productCode;
+
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
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 ce0ba64..85b542a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -121,6 +121,9 @@
ProductModel item = productModelList.get(i);
int rowNum = i + 2;
+ if (StringUtils.isEmpty(item.getProductCode())) {
+ return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [浜у搧缂栫爜] 涓嶈兘涓虹┖");
+ }
if (StringUtils.isEmpty(item.getModel())) {
return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [瑙勬牸鍨嬪彿] 涓嶈兘涓虹┖");
}
--
Gitblit v1.9.3