From a4f769c50fe9ac728ab9b74502574069ddc6f6fa Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Thu, 4 Dec 2025 17:25:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=88=90=E6=9C=AC=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pr/plugin/form/EcEqCostSplitBillPlugin.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcEqCostSplitBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcEqCostSplitBillPlugin.java index ea1b257..5bdd746 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcEqCostSplitBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EcEqCostSplitBillPlugin.java @@ -96,6 +96,7 @@ public class EcEqCostSplitBillPlugin extends AbstractBillPlugIn implements Befor } else if (StringUtils.equals(name, "equipment")) { //设备名称 List qFilter = new ArrayList<>(); + List orFilters = new ArrayList<>(); DynamicObject org = (DynamicObject) this.getModel().getValue("org");//所属组织 QFilter filter = new QFilter("zcgj_companyblentry.zcgj_org.id", QCP.equals, org.getPkValue()); @@ -104,14 +105,17 @@ public class EcEqCostSplitBillPlugin extends AbstractBillPlugIn implements Befor if (companyBelong != null) { DynamicObject zcgj_headquarters = companyBelong.getDynamicObject("zcgj_headquarters");//本部 if (zcgj_headquarters != null) { - qFilter.add(new QFilter("org", QCP.equals, zcgj_headquarters.getPkValue())); - qFilter.add(new QFilter("useorg", QCP.equals, zcgj_headquarters.getPkValue())); - } else { - qFilter.add(new QFilter("useorg", QCP.equals, org.getPkValue())); + QFilter headOrgFilter = new QFilter("org", QCP.equals, zcgj_headquarters.getPkValue()); + headOrgFilter = headOrgFilter.and(new QFilter("useorg", QCP.equals, zcgj_headquarters.getPkValue())); + orFilters.add(headOrgFilter); } - } else { - qFilter.add(new QFilter("useorg", QCP.equals, org.getPkValue())); } + orFilters.add(new QFilter("useorg", QCP.equals, org.getPkValue())); + QFilter finalFilter = orFilters.get(0); + for (int i = 1; i < orFilters.size(); i++) { + finalFilter = finalFilter.or(orFilters.get(i)); + } + qFilter.add(finalFilter); parameter.getListFilterParameter().setQFilters(qFilter); } else if (StringUtils.equals(name, "project")) {