From b8af5153f8df5498d5a00e6403948c68d1d64977 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 三月 2025 14:19:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java
index bb55ef2..3ca0618 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/FindsEquipmentProductionUtil.java
@@ -36,6 +36,7 @@
List<MdcProductionTreeModel> treeList = new ArrayList<>();
for (MdcProductionTreeModel mdcProductionTreeModel : recordList) {
if (oConvertUtils.isEmpty(mdcProductionTreeModel.getParentId())) {
+ mdcProductionTreeModel.setType(1);
treeList.add(mdcProductionTreeModel);
idList.add(new MdcEquipmentTree().convertByProduction(mdcProductionTreeModel));
}
@@ -54,6 +55,7 @@
MdcProductionTreeModel m = recordList.get(i1);
if (m.getParentId() != null && m.getParentId().equals(model.getId())) {
model.getChildren().add(m);
+ m.setType(1);
mdcEquipmentTree.getChildren().add(new MdcEquipmentTree().convertByProduction(m));
}
}
--
Gitblit v1.9.3