diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp index d6dbc0368..2d47282d1 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp @@ -42,7 +42,7 @@ }else if(roleList.contains("800R00000048")){ String userid_kj=""; BizObjectManager userInfoBOM = JBOFactory.getBizObjectManager("jbo.awe.USER_INFO"); - List userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006014").getResultList(false); + List userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006002").getResultList(false); List useridList_kj = new ArrayList(); for(BizObject bo : userListObject){ userid_kj = bo.getAttribute("userid").toString(); @@ -52,10 +52,15 @@ doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); } //登录人属于经销商角色 401:经销商roleid - if(roleList.contains("401")){ + if(roleList.contains("401") && !roleList.contains("800R00000051")){ doTemp.appendJboWhere(" and O.project_manage='"+userid+"'"); } - + String belongorg = Sqlca.getString("select belongorg from user_info where userid='"+userid+"'"); + String distributor_no = Sqlca.getString("select distributor_no from distributor_info where orgid='"+belongorg+"'"); + + if(roleList.contains("800R00000051")){ + doTemp.appendJboWhere(" and O.distributor_id='"+distributor_no+"'"); + } /* String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract"); diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp index ff8281029..bf4d775d4 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp @@ -36,7 +36,7 @@ } String useridStr = StringUtils.join(useridList.toArray(), ","); doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); - }else if(roleList.contains("800R00000045")){ + }/* else if(roleList.contains("800R00000045")){ String userid_kj=""; BizObjectManager userInfoBOM = JBOFactory.getBizObjectManager("jbo.awe.USER_INFO"); List userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006014").getResultList(false); @@ -47,11 +47,17 @@ } String useridStr = StringUtils.join(useridList_kj.toArray(), ","); doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); - } + } */ //登录人属于经销商角色 401:经销商roleid - if(roleList.contains("401")){ + if(roleList.contains("401") && !roleList.contains("800R00000051")){ doTemp.appendJboWhere(" and O.project_manage='"+userid+"'"); } + String belongorg = Sqlca.getString("select belongorg from user_info where userid='"+userid+"'"); + String distributor_no = Sqlca.getString("select distributor_no from distributor_info where orgid='"+belongorg+"'"); + + if(roleList.contains("800R00000051")){ + doTemp.appendJboWhere(" and O.distributor_id='"+distributor_no+"'"); + } diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index f0486b3c6..4e35dbda9 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -3180,7 +3180,7 @@ - + @@ -3210,6 +3210,7 @@ + @@ -3225,7 +3226,7 @@ - + @@ -3234,6 +3235,7 @@ + @@ -3247,5 +3249,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/fileTemplate/娓犻亾鍟嗗偓鏀舵姤琛.xlsx b/WebContent/fileTemplate/娓犻亾鍟嗗偓鏀舵姤琛.xlsx new file mode 100644 index 000000000..50cf2c03e Binary files /dev/null and b/WebContent/fileTemplate/娓犻亾鍟嗗偓鏀舵姤琛.xlsx differ diff --git a/WebContent/fileTemplate/娓犻亾鍟嗙閲戣鍒掓姤琛.xlsx b/WebContent/fileTemplate/娓犻亾鍟嗙閲戣鍒掓姤琛.xlsx new file mode 100644 index 000000000..bcf4f2c22 Binary files /dev/null and b/WebContent/fileTemplate/娓犻亾鍟嗙閲戣鍒掓姤琛.xlsx differ diff --git a/WebContent/fileTemplate/娓犻亾鍟嗙粨娓呮暟鎹姤琛.xlsx b/WebContent/fileTemplate/娓犻亾鍟嗙粨娓呮暟鎹姤琛.xlsx new file mode 100644 index 000000000..07edfaaba Binary files /dev/null and b/WebContent/fileTemplate/娓犻亾鍟嗙粨娓呮暟鎹姤琛.xlsx differ