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】  '; - 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+=' '; } 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 param, + public static synchronized void initDocList(Map param, Map 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 param, + public static synchronized void initDocListForMail(Map param, Map other, String docno, Configure curConfig,JBOTransaction Sqlca) throws Exception { String CustomerType = other.get("CustomerType");