diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
index ad076b0f..70acf279 100644
--- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
+++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
@@ -347,10 +347,12 @@ public class Report1Gener {
 							indexOf2 = fileNamel.indexOf("：");
 						}
 						String numberStr = fileNamel.substring(2,indexOf2);
-						if(isNumeric(numberStr)) {
+						if(isNumeric(numberStr)&&UtilString.isNotEmpty(numberStr)) {
 							isNumberAscArray.add("true");
 							int fileNumber = Integer.parseInt(numberStr);
 							object.put("file_number", fileNumber);
+						}else {
+							isNumberAscArray.add("false");
 						}
 					}
 					
diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTaskAfterCreated.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTaskAfterCreated.java
index 321ce152..bf54e730 100644
--- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTaskAfterCreated.java
+++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/ApplyTaskAfterCreated.java
@@ -28,21 +28,21 @@ public class ApplyTaskAfterCreated extends ExecuteListener implements ExecuteLis
     @Override
     public void execute(ProcessExecutionContext ctx) throws Exception {
     	TaskInstance taskInstance = ctx.getTaskInstance();
-    	if((null!=ctx.getTaskInstance()&&!"00000000-0000-0000-0000-000000000000".equals(ctx.getTaskInstance().getParentTaskInstId())||taskInstance.getTitle().contains("撤销重办"))) {
+    	if((null!=ctx.getTaskInstance()&&!"00000000-0000-0000-0000-000000000000".equals(ctx.getTaskInstance().getParentTaskInstId())||taskInstance.getTitle().contains("撤销重办")||taskInstance.getTitle().contains("收回"))) {
     		SDK.getLogAPI().consoleInfo("[任务创建]任务创建，涉及流程状态取消审批中状态，退回原有状态" + ctx.getTaskInstance().getTitle());
     		ProcessStatusAPIManager.getInstance().batchUpdateApprovalStatus(ctx.getTaskInstance().getProcessInstId(), false);
     	}
     	if("00000000-0000-0000-0000-000000000000".equals(ctx.getTaskInstance().getParentTaskInstId())) {
     		BO boData = (BO) ctx.getParameter(ListenerConst.FORM_EVENT_PARAM_BODATA);
+    		BO byProcess = SDK.getBOAPI().getByProcess("BO_ACT_COE_PUBLISH", ctx.getProcessInstance().getId());
     		Object variable = SDK.getProcessAPI().getVariable(ctx.getProcessInstance(), "createType"); 
-    		if(boData==null&&variable==null) {
-    			System.err.println("任务创建后执行====>");
-    			 saveData(ctx);
+    		if(boData==null&&variable==null&&byProcess==null) {
+    			createData(ctx);
     		 }
     	}
     }
     
-    public void saveData(ProcessExecutionContext ctx) {
+    public void createData(ProcessExecutionContext ctx) {
     	UserContext userContext = ctx.getUserContext();
     	Date date=new Date();//此时date为当前的时间
         SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置当前时间的格式，为年-月-日
diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java
index 21db4488..e8d9274d 100644
--- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java
+++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java
@@ -1164,7 +1164,22 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList
 
 		bo_Read_log.set("STARTTIMES", startTime);
 		bo_Read_log.set("ENDTIMES", endTimes);
-		bo_Read_log.set("TIMECOUNT", (endTimes - startTime) / 1000 / 60 + "分钟");
+		long time = endTimes - startTime;
+		long diffSeconds = time / 1000 % 60;
+		long diffMinutes = time / (60 * 1000) % 60;
+		long diffHours = time / (60 * 60 * 1000) % 24;
+		long diffDays = time / (24 * 60 * 60 * 1000);
+		String remainTime ="";
+		if(diffDays!=0&&diffHours!=0) {
+			remainTime = diffDays + "天" + diffHours + "小时"+diffMinutes + "分钟"+diffSeconds + "秒";
+		}else if(diffDays==0&&diffHours!=0&&diffMinutes!=0){
+			remainTime = diffHours + "小时"+diffMinutes + "分钟"+diffSeconds + "秒";
+		}else if(diffDays==0&&diffHours==0&&diffMinutes!=0) {
+			remainTime = diffMinutes + "分钟"+diffSeconds + "秒";
+		}else if(diffDays==0&&diffHours==0&&diffMinutes==0) {
+			remainTime = diffSeconds + "秒";
+		}
+		bo_Read_log.set("TIMECOUNT",remainTime);
 		// 文件发布成功回执流程
 		ProcessInstance processInst = SDK.getProcessAPI().createProcessInstance("obj_b4700f89a7a144c086d047de0cfe9531",
 				"admin", jsonObject.get("title") + "成功发布回执单");
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
index 5c200c87..f9f3fa75 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java
@@ -293,7 +293,7 @@ public class UpfileWeb extends ActionWeb {
 		r.put("uuids", uuids);
 		return r.toString();
 	}
-
+	
 	/**
 	 * 删除tmp目录下对应文件
 	 * @param model
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
index 34236d90..dd161921 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
@@ -11032,6 +11032,10 @@ public String deleteReply(String replyid, String messageid) {
 					continue;
 				}
 			}
+			//普通用户不允许删除已发布的文件
+			if(model.isPublish()&&!"admin".equals(_uc.getUID())) {
+				return ResponseObject.newErrResponse("已发布文件不允许删除，请联系系统管理员！").toString();
+			}
 			String result = removeTreeNode(repositoryId, wsId);
 			JSONObject moveRo = JSONObject.parseObject(result);
 			if (!"ok".equals(moveRo.getString("result"))) {