From 5f634c2fa6972fb7d6cdb2e4f213de0fb6d060f8 Mon Sep 17 00:00:00 2001
From: jianghongdong <jianghd@tenwa.com.cn>
Date: Tue, 21 Aug 2018 14:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=20=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=AF=B9=E5=AE=A2=E6=88=B7=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=B3=95=E4=BA=BA=E4=B8=8E=E8=87=AA=E7=84=B6=E7=9A=84=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8E=E3=80=82=E5=88=9D=E5=A7=8B=E5=8C=96=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=B1=BB=E5=9E=8B=E5=A6=82=E6=9E=9C=E6=98=AF?=
 =?UTF-8?q?=E8=87=AA=E7=84=B6=E4=BA=BA=E5=88=99=E6=8A=8A006=E5=BC=80?=
 =?UTF-8?q?=E5=A4=B4=E7=9A=84=E9=99=84=E4=BB=B6=E7=B1=BB=E5=88=AB=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=EF=BC=8C=E5=8F=8D=E4=B9=8B=E6=B3=95=E4=BA=BA=E6=8A=8A?=
 =?UTF-8?q?003=E5=BC=80=E5=A4=B4=E7=9A=84=E6=8E=92=E9=99=A4=E3=80=82?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BB=8E=E5=89=8D=E5=8F=B0=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?CustomerType=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp
index d03643405..e5e75d59f 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 CustomerType=CurPage.getParameter("CustomerType");
 	String carAttributes=CurPage.getParameter("carAttributes");//获取车类型
     if(flowunid==""||flowunid==null){
     	flowunid="flowunid";
@@ -44,6 +45,7 @@
 	Map<String,String> docParam=new HashMap<String,String>();
     Map<String,String> other=new HashMap<String,String>();
     other.put("carAttributes", carAttributes);
+    other.put("CustomerType", CustomerType);
     docParam.put("ObjectType",sObjectType);
     docParam.put("proj_id", flow.getAttribute("proj_id").getString());
     docParam.put("contract_id", flow.getAttribute("contract_id").getString());
diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java
index 1df6b6d08..3a2ca6fa7 100644
--- a/src_core/com/tenwa/doc/action/DocListInitAction.java
+++ b/src_core/com/tenwa/doc/action/DocListInitAction.java
@@ -36,9 +36,15 @@ public class DocListInitAction {
 	 */
 	@SuppressWarnings("unchecked")
 	public static void initDocList(Map<String,String> param,Map<String,String> other,String docno,Configure curConfig) throws Exception{
+		String CustomerType = other.get("CustomerType");
 		String[] itemnos=docno.split(",");
 	    String s="";
 	    for(int i=0;i<itemnos.length;i++){
+	    	if("03".equals(CustomerType)){
+	    		if(itemnos[i].startsWith("006")){continue;}
+	    	}else if("01".equals(CustomerType)){
+	    		if(itemnos[i].startsWith("003")){continue;}
+	    	}
 	    	s+="'"+itemnos[i]+"',";
 	    }
 	    if(s.length()>0){
@@ -48,9 +54,11 @@ public class DocListInitAction {
 		BizObjectManager relaBm=JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME);
 		BizObjectManager libBm=JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
 		BizObjectManager configBm=JBOFactory.getBizObjectManager(LB_DOCCONFIG.CLASS_NAME);
-		
+		if("".equals(docno)){
+			return;
+		}
 		String sql=getDocSQL(param,docno);
-		BizObject rela=relaBm.createQuery(sql).getSingleResult(false);
+		BizObject rela=relaBm.createQuery(sql).getSingleResult(true);
 		String relativeid="";
 		String libid="";
 		if(rela==null){