From 9f0efcd468a88d2d9d490b0bd1c3f4039abba127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 4 Jul 2024 17:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E5=BA=93=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsMarketStandardServiceImpl.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index 865da584..2adcac97 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -165,7 +165,10 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         lawsMarketStandardDetailService.remove(wrapper);
         // 添加新数据
         List<LawsMarketStandardDetail> lists = marketStandardDetailVO.getLists();
-        lists.forEach(e -> e.setManifestId(manifest.getId()));
+        lists.forEach(e -> {
+            e.setManifestId(manifest.getId());
+            e.setId(null);
+        });
         lawsMarketStandardDetailService.saveBatch(lists);
     }
 
@@ -173,7 +176,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     public List<LawsMarketStandardDetail> importExcel(MultipartFile file) {
         List<LawsMarketStandardDetail> list = new ArrayList<>();
         ImportParams params = new ImportParams();
-        params.setTitleRows(2);
+        params.setTitleRows(4);
         params.setHeadRows(1);
         params.setNeedSave(true);
         try {