From b27ed7d9cd20a847ed095ff8d22bc3f319e015da Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Fri, 12 Sep 2025 15:24:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E7=BA=A7=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/PaymentApplicationPlugin.java | 17 ++++++++++------- .../plugin/form/EquipmentCommandBillPlugin.java | 16 ++++++++++------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PaymentApplicationPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PaymentApplicationPlugin.java index b4bd045..d8ad18e 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PaymentApplicationPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PaymentApplicationPlugin.java @@ -26,6 +26,7 @@ import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.QueryServiceHelper; import kd.bos.servicehelper.org.OrgUnitServiceHelper; +import kd.bos.servicehelper.org.OrgViewType; import kd.bos.servicehelper.user.UserServiceHelper; import kd.fi.er.business.bean.CostDeptF7ChangePram; import kd.fi.er.business.servicehelper.CoreBaseBillServiceHelper; @@ -35,10 +36,7 @@ import kd.fi.er.business.utils.ErEntityTypeUtils; import kd.fi.er.business.utils.ErStdConfig; import kd.sdk.plugin.Plugin; -import java.util.ArrayList; -import java.util.EventObject; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 用款申请单表单插件 @@ -204,9 +202,14 @@ public class PaymentApplicationPlugin extends AbstractBillPlugIn implements Atta }; cost = BusinessDataServiceHelper.loadSingle("bos_adminorg", qFilters); } - DynamicObjectCollection structureCollection = cost.getDynamicObjectCollection("structure");//组织结构分录 - DynamicObject structure = structureCollection.get(0); - viewParent = structure.getDynamicObject("viewparent");//上级组织 + long currentOrgId = Long.parseLong(cost.getString("id"));//当前部门ID + Map orgParentMap = OrgUnitServiceHelper.getDirectSuperiorOrg(OrgViewType.Admin, Collections.singletonList(currentOrgId));//获取当前部门的上级组织 + Long parentId = orgParentMap.get(currentOrgId);//上级组织ID + viewParent = BusinessDataServiceHelper.loadSingle("bos_adminorg", + new QFilter[]{new QFilter("id", QCP.equals, parentId)});//行政组织-上级组织 +// DynamicObjectCollection structureCollection = cost.getDynamicObjectCollection("structure");//组织结构分录 +// DynamicObject structure = structureCollection.get(0); +// viewParent = structure.getDynamicObject("viewparent");//上级组织 String viewParentNumber = viewParent.getString("number"); QFilter[] qFilters = new QFilter[]{ new QFilter("number", QCP.equals, viewParentNumber) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java index 2a2df3d..c7b8ee9 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java @@ -21,11 +21,10 @@ import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.org.OrgUnitServiceHelper; +import kd.bos.servicehelper.org.OrgViewType; import kd.bos.servicehelper.user.UserServiceHelper; -import java.util.ArrayList; -import java.util.EventObject; -import java.util.List; +import java.util.*; /* * 设备调令单表单插件 @@ -387,9 +386,14 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be }; cost = BusinessDataServiceHelper.loadSingle("bos_adminorg", qFilters);//行政组织 } - DynamicObjectCollection structureCollection = cost.getDynamicObjectCollection("structure");//组织结构分录 - DynamicObject structure = structureCollection.get(0); - viewParent = structure.getDynamicObject("viewparent");//上级组织 + long currentOrgId = Long.parseLong(cost.getString("id"));//当前部门ID + Map orgParentMap = OrgUnitServiceHelper.getDirectSuperiorOrg(OrgViewType.Admin, Collections.singletonList(currentOrgId));//获取当前部门的上级组织 + Long parentId = orgParentMap.get(currentOrgId);//上级组织ID + viewParent = BusinessDataServiceHelper.loadSingle("bos_adminorg", + new QFilter[]{new QFilter("id", QCP.equals, parentId)});//行政组织-上级组织 +// DynamicObjectCollection structureCollection = cost.getDynamicObjectCollection("structure");//组织结构分录 +// DynamicObject structure = structureCollection.get(0); +// viewParent = structure.getDynamicObject("viewparent");//上级组织 String viewParentNumber = viewParent.getString("number"); QFilter[] qFilters = new QFilter[]{ new QFilter("number", QCP.equals, viewParentNumber)