From cbb9e2f03c6a05ce31c115b787693437aa43f7f0 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 30 Aug 2018 18:48:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=99=84=E4=BB=B6=E4=B8=80?= =?UTF-8?q?=E8=A7=88=E6=B5=81=E7=A8=8B=E5=8F=96=E6=B6=88=E5=86=8D=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=90=8E=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Comm/Document/DocImageShow.jsp | 3 +-- WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp index d2f7213a9..c1b0be42a 100644 --- a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp +++ b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp @@ -20,7 +20,6 @@ border-bottom:1px solid #BCBCBC;} String flowunid=CurPage.getParameter("ObjectNo"); String sObjectType=CurPage.getParameter("FlowNo"); - String type=CurPage.getParameter("type"); if(type==null)type=""; @@ -37,7 +36,7 @@ border-bottom:1px solid #BCBCBC;} } String compClientID = request.getParameter("CompClientID"); String sql="select O.id,lib.doc_name,filename from O left join jbo.app.tenwa.doc.LB_DOCLIBRARY lib on o.library_id=lib.id left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on lib.relative_id=rela.id"; - sql+=" where O.content_type LIKE '%image%' "+otherWhere+"and rela.flow_unid='"+flowunid+"'order by lib.doc_name,O.filename"; + sql+=" where O.content_type LIKE '%image%' "+otherWhere+"and rela.objecttype='"+sObjectType+"' order by lib.doc_name,O.filename"; System.out.println(sql); List list=JBOFactory.createBizObjectQuery("jbo.app.tenwa.doc.LB_DOCATTRIBUTE", sql).getResultList(false); diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp index 2e8663b6b..587ee173a 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp @@ -2,6 +2,10 @@ <%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%> <%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %> <%@ page import="com.tenwa.doc.action.DocListInitAction" %> +<%@page import="com.amarsoft.are.jbo.BizObject"%> +<%@page import="com.amarsoft.are.jbo.JBOException"%> +<%@page import="com.amarsoft.are.jbo.JBOFactory"%> +<%@page import="jbo.sys.FLOW_OBJECT"%> <% /* Author: undefined 2016-09-01 @@ -46,7 +50,7 @@ dwTemp.ReadOnly = "1"; dwTemp.MultiSelect=true;//多选 dwTemp.setPageSize(50); - dwTemp.genHTMLObjectWindow(flowunid); + dwTemp.genHTMLObjectWindow(sObjectType); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] =null; if((RightType!=null&&RightType.equals("ReadOnly"))||(null!=isHistory&&isHistory.equals("true"))){