From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/MyFileAction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/MyFileAction.java b/gx_tieta/src/com/fgkj/actions/MyFileAction.java
index 684ddc7..8e6bd5f 100644
--- a/gx_tieta/src/com/fgkj/actions/MyFileAction.java
+++ b/gx_tieta/src/com/fgkj/actions/MyFileAction.java
@@ -211,7 +211,7 @@
 		ServiceModel model = new ServiceModel();
 		String loadpath = ActionUtil.getSession().getServletContext().getRealPath("/");
 		String str = new File(loadpath).getParentFile().getAbsolutePath();	
-		if(binf != null && binf.getStationId() != null && binf.getStationName() != null){
+		if(binf != null && binf.getStationId() != null && binf.getVideoOrImage() != null){
 			String filesource = str+File.separator+fileRoot+File.separator+binf.getStationId()+File.separator+binf.getVideoOrImage()+File.separator;				//褰撳墠璇锋眰鐨勬満鎴挎墍鍦ㄧ殑璧勬簮鏂囦欢澶�
 			//System.out.println(filesource);
 			File source = new File(filesource);

--
Gitblit v1.9.1