From 552d480ac8937f29be54ee4b085f2cda272a63e4 Mon Sep 17 00:00:00 2001
From: yjf <2211675158@qq.com>
Date: Mon, 24 Jan 2022 09:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E9=87=91=E5=82=AC=E6=94=B6=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rentcollection/rentCollectionList.jsp            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
index 522d65546..5532e817c 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
@@ -25,13 +25,13 @@
 	String distributorNo = Sqlca.getString("select distributor_no from distributor_info where orgid = '" + CurUser.getOrgID() + "'");
 	if(!StringX.isEmpty(distributorNo)){
 		doTemp.appendJboWhere(" o.distributor_id = '"+distributorNo+"'");
+	}else{
+		//重催组角色查看所有，其余角色查看分配给当前角色数据
+		String roleidq = Sqlca.getString("select group_concat(roleid) from USER_ROLE where USERID='"+CurUser.getUserID()+"'");
+		if (!(StringX.isEmpty(roleidq) || roleidq.contains("800R00000043"))) {
+			doTemp.appendJboWhere("  odi.part_dept='" + userid + "'");
+		}
 	}
-	//重催组角色查看所有，其余角色查看分配给当前角色数据
-	String roleidq = Sqlca.getString("select group_concat(roleid) from USER_ROLE where USERID='"+CurUser.getUserID()+"'");
-	if(!StringX.isEmpty(roleidq) &&  !roleidq.contains("800R00000043")){
-		doTemp.appendJboWhere("  odi.part_dept='" + userid + "'");
-	}
-
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式