From 3868b706ee3ee115a400d77abc3b69b83ea448c7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 03 Sep 2021 14:15:36 +0800
Subject: [PATCH] bug123
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 5047e2d..a8f8c09 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
@@ -4,13 +4,11 @@
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
-import com.matrix.core.tools.DateUtil;
-import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.StringUtils;
-import com.matrix.core.tools.WebUtil;
+import com.matrix.core.tools.*;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
@@ -245,8 +243,8 @@
public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {
String fileName = file.getOriginalFilename();
- String dirPath = "E:";
- //PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+// String dirPath = "E:";
+ String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
File saveFile = new File(dirPath + "/" + fileName);
file.transferTo(saveFile);
@@ -280,7 +278,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