From fa14cfee7567145623940da70c197a86c9a5b25e Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Thu, 25 Jul 2019 15:47:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=92=8C=E9=80=80=E5=9B=9E=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B7=B2=E7=BB=8F=E4=B8=8A=E4=BC=A0=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Tenwa/Comm/DocList/PayDocList.jsp         | 3 ++-
 src_core/com/tenwa/doc/action/DocListInitAction.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
index 4521218af..db2436d86 100644
--- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
+++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
@@ -10,6 +10,7 @@
     */ 
     
     String flowunid=CurPage.getParameter("FlowUnid");
+	String flowstate=CurPage.getParameter("flowstate");
     String CustomerType=CurPage.getParameter("CustomerType");
 	String carAttributes=CurPage.getParameter("carAttributes");//获取车类型
     if(flowunid==""||flowunid==null){
@@ -152,7 +153,7 @@ function afterSearch(){
 			html+='【上传时间:'+obj[file]['inputtime']+'】';
 			html+='【上传人:'+obj[file]['inputuser']+'】';
 // 			html+='【大小:'+Math.floor(obj[file]['FileSize']/1024*100)/100+'kb】<a class="btn_icon_detail" onclick="editOffice(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\',\''+sRightType+'\')">&nbsp;</a> ';
-			if(isReview!="true"&&sRightType!="ReadOnly"&&(sObjectType==obj[file]['objecttype'])&&username==obj[file]['inputuser']){
+			if(isReview!="true"&&sRightType!="ReadOnly"&&(sObjectType==obj[file]['objecttype'])&&username==obj[file]['inputuser']&&"ANYBACK"!="<%=flowstate%>"){
 				html+='<a class="btn_icon btn_icon_close" onclick="deleteFile(\''+obj[file]['id']+'\');">&nbsp;</a>';
 			}
 			if(obj[file]['image']=="true"){
diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java
index 4bdc33abc..fffc692bc 100644
--- a/src_core/com/tenwa/doc/action/DocListInitAction.java
+++ b/src_core/com/tenwa/doc/action/DocListInitAction.java
@@ -51,7 +51,7 @@ public class DocListInitAction {
 	 * @throws Exception
 	 */
 	@SuppressWarnings("unchecked")
-	public static void initDocList(Map<String, String> param,
+	public static synchronized void initDocList(Map<String, String> param,
 			Map<String, String> other, String docno, Configure curConfig)
 			throws Exception {
 		String CustomerType = other.get("CustomerType");
@@ -162,7 +162,7 @@ public class DocListInitAction {
 
 	}
 	@SuppressWarnings("unchecked")
-	public static void initDocListForMail(Map<String, String> param,
+	public static synchronized void initDocListForMail(Map<String, String> param,
 			Map<String, String> other, String docno, Configure curConfig,JBOTransaction Sqlca)
 			throws Exception {
 		String CustomerType = other.get("CustomerType");