diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
index f76e2b40c..8f746f61b 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
@@ -336,7 +336,7 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService {
 		String phaseno = fo == null ? "" : fo.getAttribute("PHASENO").getString();
 		
 		String othwhere = "";
-		if("BusinessApplyFlow".equals(applyFlow)||"BusinessChangeFlow".equals(applyFlow)||"BusinessCancelFlow".equals(applyFlow)||"BContractApproveFlow".equals(applyFlow)||"BContractCancelFlow".equals(applyFlow)||"".equals(applyFlow)){
+		if("BusinessApplyFlow".equals(applyFlow)||"BusinessChangeFlow".equals(applyFlow)||"BusinessCancelFlow".equals(applyFlow)||"BContractApproveFlow".equals(applyFlow)||"BContractCancelFlow".equals(applyFlow)||"BContractChangeFlow".equals(applyFlow)){
 			othwhere = " and O.ObjectType='BusinessApplyFlow'";
 		}else{
 			othwhere = " and O.ObjectType='"+applyFlow+"'";
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java
index 229b87619..8c3be09db 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java
@@ -8,6 +8,7 @@ import java.io.InputStream;
 import java.net.URLDecoder;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
@@ -154,6 +155,12 @@ public class BusinessDocUploadServiceImpl implements BusinessDocUploadService {
 	}
 
 	public Object isImage(File file,Object object) throws Exception{
+		String reg = "(mp4|flv|avi|rm|rmvb|wmv)";
+        Pattern p = Pattern.compile(reg);
+        boolean boo = p.matcher(file.getName()).find();
+        if(boo){
+        	return "video";
+        }
 		BufferedImage bi = ImageIO.read(file);
 		if(bi==null){
 			return object;
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/LibraryDocUploadServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/LibraryDocUploadServiceImpl.java
index 95b135525..6d6ed15ce 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/LibraryDocUploadServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/LibraryDocUploadServiceImpl.java
@@ -8,6 +8,7 @@ import java.io.InputStream;
 import java.net.URLDecoder;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
@@ -43,6 +44,11 @@ public class LibraryDocUploadServiceImpl implements LibraryDocUploadService {
 		System.out.println("=======================================");
 		fieldMap = (Map<String, Object>) testMap.get("fieldMap"); // 参数
 		fileList = (List<Map<String, Object>>) testMap.get("fileList"); // 资料列表
+		if(fileList == null || fileList.size()==0){
+			ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("success").toString(), "");
+			return ReturnMapUtil.getReturnMap();
+		}
+		
 		String applyType = fieldMap.get("applytype") == null ? "" : fieldMap.get(
 				"applytype").toString();
 
@@ -120,6 +126,12 @@ public class LibraryDocUploadServiceImpl implements LibraryDocUploadService {
 		return ReturnMapUtil.getReturnMap();
 	}
 	public Object isImage(File file,Object object) throws Exception{
+		String reg = "(mp4|flv|avi|rm|rmvb|wmv)";
+        Pattern p = Pattern.compile(reg);
+        boolean boo = p.matcher(file.getName()).find();
+        if(boo){
+        	return "video";
+        }
 		BufferedImage bi = ImageIO.read(file);
 		if(bi==null){
 			return object;