From e9b3114cec0cb13ddb911225a37cfc2eec10fa7a Mon Sep 17 00:00:00 2001
From: 2369059705@qq.com <2369059705@qq.com>
Date: 星期四, 08 六月 2023 14:12:47 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-data-export-import/V2.0.0
---
src/main/java/com/product/module/data/service/SystemDataUpLoadService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/product/module/data/service/SystemDataUpLoadService.java b/src/main/java/com/product/module/data/service/SystemDataUpLoadService.java
index 8b6ef1c..01ef57b 100644
--- a/src/main/java/com/product/module/data/service/SystemDataUpLoadService.java
+++ b/src/main/java/com/product/module/data/service/SystemDataUpLoadService.java
@@ -1,7 +1,6 @@
package com.product.module.data.service;
-import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -38,7 +37,6 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
import java.util.*;
@Service
@@ -580,9 +578,13 @@
FieldSetEntity attachmentFse = baseDao.getFieldSetEntity(CmnConst.TABLE_PRODUCT_SYS_ATTACHMENT, logFse.getString(CmnConst.FIELD_IMPORT_INFO), false);
String relativePath = attachmentFse.getString(CmnConst.FIELD_ATTACHMENT_URL);
String templateName = attachmentFse.getString(CmnConst.FIELD_ATTACHMENT_TITLE);
- String filePath = Global.getSystemConfig("local.dir", "") + File.separator + relativePath + File.separator + templateName;
- Map<String, List<List<String>>> dataMap = EasyExcelUtil.readExcelByString(filePath);
-
+ Map<String, List<List<String>>> dataMap= new HashMap<>();
+ try{
+ String filePath = Global.getSystemConfig("local.dir", "") + File.separator + relativePath + File.separator + templateName;
+ dataMap = EasyExcelUtil.readExcelByString(filePath);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
// 灏佽鍒癲te涓�
List<DataTableEntity> beforeSaveDataList = Lists.newArrayList();
List<String> titleList;
--
Gitblit v1.9.2