From a92b12d5adaa8827c1474d42b73c98e17953ecb5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 08 四月 2026 17:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
index 381b642..57b6fac 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
@@ -131,7 +131,7 @@
@Override
public List<ProductStructureDto> listBybomId(Integer bomId) {
- List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId);
+ List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId, false);
Map<Long, ProductStructureDto> map = new HashMap<>();
for (ProductStructureDto node : list) {
@@ -154,4 +154,9 @@
return tree;
}
+ @Override
+ public List<ProductStructureDto> listBybomIdIsParent(Integer bomId) {
+ return productStructureMapper.listBybomId(bomId, true);
+ }
+
}
--
Gitblit v1.9.3