diff --git a/src/main/java/com/yem/wm/im/csrCreditLine/validator/CsrCreditSubmitLineValidator.java b/src/main/java/com/yem/wm/im/csrCreditLine/validator/CsrCreditSubmitLineValidator.java index e2fd8138..1e4977b6 100644 --- a/src/main/java/com/yem/wm/im/csrCreditLine/validator/CsrCreditSubmitLineValidator.java +++ b/src/main/java/com/yem/wm/im/csrCreditLine/validator/CsrCreditSubmitLineValidator.java @@ -34,13 +34,15 @@ public class CsrCreditSubmitLineValidator extends AbstractValidator { if (!customer.containsProperty("yem_customer")) { customer = BusinessDataServiceHelper.loadSingleFromCache(customer.getPkValue(), customer.getDynamicObjectType().getName()); } - QFilter qFilter = new QFilter("yem_customer.yem_customer", QCP.equals, customer.getString("yem_customer")); + QFilter qFilter = new QFilter("billstatus", QCP.in, new String[]{"B", "C"}); // QFilter qFilter = new QFilter("yem_customer", QCP.equals, customer.getPkValue()); // qFilter.and(new QFilter("org", QCP.equals, org.getPkValue())); // qFilter.and(new QFilter("yem_bizdate", QCP.large_than, yearBegin)); // qFilter.and(new QFilter("yem_bizdate", QCP.less_equals, yearLast)); - qFilter.and(new QFilter("billstatus", QCP.in, new String[]{"B", "C"})); - qFilter.and(new QFilter("yem_payment.id", QCP.equals, method.getLong("id"))); + String yemCustomer = customer.getString("yem_customer"); + if (!"".equals(yemCustomer)) { + qFilter.and(new QFilter("yem_customer.yem_customer", QCP.equals, yemCustomer)); + }qFilter.and(new QFilter("yem_payment.id", QCP.equals, method.getLong("id"))); if ("信用证".contains(method.getString("name"))) { qFilter.and(new QFilter("yem_swiftcode", QCP.equals, swiftcode)); }