Merge remote-tracking branch 'origin/release20210415' into release20210415

This commit is contained in:
zhangbeibei 2021-03-22 15:50:51 +08:00
commit 89e2ca88c1
2 changed files with 465 additions and 477 deletions

View File

@ -123,7 +123,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
BizObject distributorBo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false);
String distributorType = distributorBo.getAttribute("TYPE").toString();
if((this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString()))
|| "type03".equals(distributorType)){//×ÔÓªµê
|| "types03".equals(distributorType)){//×ÔÓªµê
distributoIid=this.getAttribute("distributorNo").toString();
vndrName=this.getAttribute("distributorName").toString();
}else{
@ -197,7 +197,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
BizObject distributorBo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",deptid).getSingleResult(false);
String fiType = distributorBo.getAttribute("TYPE").toString();
if((this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString()))
|| "type03".equals(fiType)){//×ÔÓªµê
|| "types03".equals(fiType)){//×ÔÓªµê
distributoIid=this.getAttribute("distributorNo").toString();
vndrName=this.getAttribute("distributorName").toString();
}else{