diff --git a/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonBillOsPaymentBillFormPlugin.java b/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonBillOsPaymentBillFormPlugin.java index 4670383..55f8b92 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonBillOsPaymentBillFormPlugin.java +++ b/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonBillOsPaymentBillFormPlugin.java @@ -117,20 +117,13 @@ public class CommonBillOsPaymentBillFormPlugin extends AbstractBillPlugIn implem QFilter qF = new QFilter("number", QCP.in,paymentNumbers); ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); QFilter Qf= new QFilter("number", QCP.in, sets); - ArrayList objects = new ArrayList(); - objects.add(Qf); - formShowParameter.getTreeFilterParameter().setQFilters(objects); + logger.info("付款事项编码树集合为"+sets.toString()); + formShowParameter.getTreeFilterParameter().getQFilters().add(new QFilter("number", QCP.in, sets)); formShowParameter.getListFilterParameter().setFilter(qF); }else { beforeF7SelectEvent.setCancel(true); this.getView().showTipNotification("此类型单据无关联付款事项"); } - - QFilter qFilter = new QFilter("number", QCP.equals, "CF0001"); - ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); - ArrayList objects = new ArrayList(); - objects.add(qFilter); - formShowParameter.getTreeFilterParameter().setQFilters(objects); } } diff --git a/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonExpenseItemBillFormPlugin.java b/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonExpenseItemBillFormPlugin.java index 58288a7..e20591a 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonExpenseItemBillFormPlugin.java +++ b/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/CommonExpenseItemBillFormPlugin.java @@ -97,11 +97,7 @@ public class CommonExpenseItemBillFormPlugin extends AbstractBillPlugIn implemen if (!paymentIds.isEmpty()){ QFilter qF = new QFilter("id", QCP.in,paymentIds); ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); - - QFilter QF= new QFilter("number", QCP.in, sets); - ArrayList objects = new ArrayList(); - objects.add(QF); - formShowParameter.getTreeFilterParameter().setQFilters(objects); + formShowParameter.getTreeFilterParameter().getQFilters().add(new QFilter("number", QCP.in, sets)); formShowParameter.getListFilterParameter().setFilter(qF); }else { beforeF7SelectEvent.setCancel(true);