From 48a94c6c6894aa0f3289f41b2b50926756d5c67a Mon Sep 17 00:00:00 2001 From: chenshaoxin <1981897232@qq.com> Date: Wed, 23 Apr 2025 15:39:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88?= =?UTF-8?q?=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/4/23=2016?= =?UTF-8?q?=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E4=B8=8A=E5=88=92=E4=B8=8B?= =?UTF-8?q?=E6=8B=A8=EF=BC=88new=EF=BC=89=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/plugin/report/FinanceReportfordatePlugin.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java index 86d4652..77e7e85 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportfordatePlugin.java @@ -81,6 +81,7 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin { } HashMap> map = new HashMap<>();//组织层级关系 + List ids = new ArrayList<>(); //如果有组织则单独处理，没有则走getOrgrelate方法 if (shkd_seluserpower==null){ getOrgrelate(map, selorgDy); @@ -95,6 +96,9 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin { } } + for (Long key : map.keySet()) { + ids.add(key); + } //根据组织关系配置sql StringBuilder sqlBuilder = new StringBuilder("/*dialect*/ "); @@ -104,11 +108,12 @@ public class FinanceReportfordatePlugin extends AbstractReportListDataPlugin { DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), sqlBuilder.toString());//财务云 + QFilter filter = new QFilter("id", QCP.in, ids); //业务单元数据集 - DataSet balanceDataSet = QueryServiceHelper.queryDataSet(this.getClass().getSimpleName(),"bos_org","id,number as shkd_orgnumber,name as shkd_org", null, null); + DataSet balanceDataSet = QueryServiceHelper.queryDataSet(this.getClass().getSimpleName(),"bos_org","id,number as shkd_orgnumber,name as shkd_org", filter.toArray(), null); - JoinDataSet join = res.join(balanceDataSet, JoinType.INNER);//连接组织 + JoinDataSet join = res.join(balanceDataSet, JoinType.RIGHT);//连接组织 DataSet dataSet = join.on("zz","id").select(new String[]{ "shkd_orgnumber","shkd_org",