From ad4ca8b63e18437824354fbe7ef9e0c92057bac5 Mon Sep 17 00:00:00 2001
From: zhangzhiguo <421587375@qq.com>
Date: Mon, 24 Nov 2025 17:25:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcdev/pr/plugin/form/EquipmentCardListPlugin.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
index ff29153..c04356b 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCardListPlugin.java
@@ -32,6 +32,7 @@ import kd.fi.gl.util.DateUtil;
 import kd.sdk.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import zcgj.zcdev.zcdev.pr.task.EquipmentCardTaskPlugin;
+import zcgj.zcdev.zcdev.pr.task.NewEquipmentCardTaskPlugin;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -88,10 +89,18 @@ public class EquipmentCardListPlugin extends AbstractListPlugin implements Plugi
         }else if(itemKey.equals("zcgj_assetorg")){//同步使用组织
             Set<Long> setIds = getSelectOrderIds(this.getSelectedRows());
             DynamicObject[] equipments = BusinessDataServiceHelper.load("eceq_equipment_card", "billno,billname,equipstatus,org,zcgj_headusedepts,useorg", new QFilter[]{new QFilter("id", "in", setIds)});
+            DynamicObject[] equipinfo = BusinessDataServiceHelper.load("eceq_equipinfo", "useorg", new QFilter[]{new QFilter("id", "in", setIds)});
             DynamicObjectCollection collection = new DynamicObjectCollection();
             for (DynamicObject equipment : equipments) {
                 DynamicObject org = equipment.getDynamicObject("org");
-                equipment.set("useorg",org);
+                long equipmentId = equipment.getLong("id");
+                for (DynamicObject dynamicObject : equipinfo) {
+                    long equipinfoId = dynamicObject.getLong("id");
+                    DynamicObject useorg = dynamicObject.getDynamicObject("useorg");//设备使用组织为空
+                    if (equipmentId == equipinfoId && useorg == null) {
+                        equipment.set("useorg",org);
+                    }
+                }
                 collection.add(equipment);
             }
             SaveServiceHelper.save(collection.toArray(new DynamicObject[]{}));