From bc0898f18e741571608176d89cdd16b94c781913 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 May 2022 10:25:42 +0800
Subject: [PATCH] fix money_card_use 默认储值卡处理
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
index e570d17..ab9b83e 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
@@ -234,6 +234,8 @@
}
+ @Value("${file_storage_path}")
+ private String fileStoragePath;
@@ -244,7 +246,7 @@
String fileName = file.getOriginalFilename();
// String dirPath = "E:";
- String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+ String dirPath = fileStoragePath;
File saveFile = new File(dirPath + "/" + fileName);
file.transferTo(saveFile);
@@ -278,7 +280,7 @@
List<Object> objects = taocanDataList.get(j);
LogUtil.info("导入套餐第" + j + "行" + objects);
Object vipName = objects.get(0);
- String vipNameStr = vipName.toString();
+ String vipNameStr = vipName==null?"":vipName.toString();
if (taocan == null
|| (taocan != null && StringUtils.isNotBlank(vipNameStr))) {
//切换下一个套餐
--
Gitblit v1.9.1