diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java index dcfd4311f..3b351b4d6 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java @@ -35,7 +35,7 @@ public class LBCustomerRelaProjToContractBusiness extends BaseBussiness { fromCondtion.put("contract_id",""); Map other=new HashMap(); other.put("flowunid",this.getAttribute("FlowUnid").toString()); - DataOperatorUtil.copySingleJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, null, other, Sqlca); + DataOperatorUtil.copyJBOSet(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, null, other, null,Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca); List unionList= DataOperatorUtil.getSetJBO(LB_UNION_LESSEE.CLASS_NAME, fromCondtion, Sqlca); //List unitList=DataOperatorUtil.getSetJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, Sqlca); diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java index a1e3fb657..ac1775f24 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java @@ -49,7 +49,7 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ if(businessType.equals("1")){//1是汽车业务 //补充业务逻辑,如果贴息余额不够的情况,就不给通过 Map discount = ProductParamUtil.getProductComponentAllParameters(this.getProductId(), "PRD0315", "DISCOUNT"); - if(!discount.isEmpty() && null != discount.get("DISCOUNT_ALL") && null != discount.get("CostType08")) { + if(!discount.isEmpty() && !"".equals(discount.get("DISCOUNT_ALL")) && !"".equals(discount.get("CostType08"))) { synchronized (this) { String discountAll = discount.get("DISCOUNT_ALL"); String discountValue = discount.get("CostType08");