From d839edf15d110f25cb05b76c10b861d96996e1ee Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 19 十一月 2018 16:41:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/MyFileAction.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/MyFileAction.java b/gx_tieta/src/com/fgkj/actions/MyFileAction.java
index 4053240..daf7162 100644
--- a/gx_tieta/src/com/fgkj/actions/MyFileAction.java
+++ b/gx_tieta/src/com/fgkj/actions/MyFileAction.java
@@ -213,11 +213,11 @@
String str = new File(loadpath).getParentFile().getAbsolutePath();
if(binf != null && binf.getStationId() != null && binf.getStationName() != null){
String filesource = str+File.separator+fileRoot+File.separator+binf.getStationId()+File.separator+binf.getStationName()+File.separator; //褰撳墠璇锋眰鐨勬満鎴挎墍鍦ㄧ殑璧勬簮鏂囦欢澶�
- System.out.println(filesource);
+ //System.out.println(filesource);
File source = new File(filesource);
File[] files = source.listFiles();
model.setMsg("鏆傛棤瑙嗛鏂囦欢");
- if(files.length>0){
+ if(files!=null && files.length>0){
List myfiles = new ArrayList<MyFile>();
for(int i=0;i<files.length;i++){
MyFile myfile = new MyFile();
--
Gitblit v1.9.1