diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/CasRecbillFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/CasRecbillFormPlugin.java index 9eb1bb5..ee7e11b 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/CasRecbillFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/CasRecbillFormPlugin.java @@ -199,7 +199,6 @@ public class CasRecbillFormPlugin extends AbstractBillPlugIn implements BeforeF7 DynamicObject dataEntity = this.getModel().getDataEntity(); DynamicObject org = dataEntity.getDynamicObject("org");//收款公司 QFilter qFilter = new QFilter("company.id", QFilter.equals, org.getLong("id")); - qFilter.and(new QFilter("tradetype", QFilter.equals, "collect")); showParameter.getListFilterParameter().setFilter(qFilter); } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentDealBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentDealBillPlugin.java index d334dba..2763052 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentDealBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/PaymentDealBillPlugin.java @@ -153,7 +153,6 @@ public class PaymentDealBillPlugin extends AbstractBillPlugIn implements Plugin, DynamicObject dataEntity = this.getModel().getDataEntity(); DynamicObject org = dataEntity.getDynamicObject("org");//付款人(公司) QFilter qFilter = new QFilter("company.id", QFilter.equals, org.getLong("id")); - qFilter.and(new QFilter("tradetype", QFilter.equals, "redeem")); showParameter.getListFilterParameter().setFilter(qFilter); } }