From f2ed0fb5ca004131c0d0ec1ab476850841b44361 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Tue, 2 Jan 2024 23:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=B8=A6?=
 =?UTF-8?q?=E4=B8=8B=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/master/BomNewMbomParentMapper.java    |  5 +++++
 .../bomnew/pojo/vo/BomNewMbomMiddleVO.java       | 16 ++++++++++++++++
 .../mapper/master/BomNewMbomParentMapper.xml     |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java
index 5473315f..9ec04ca8 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java
@@ -32,6 +32,11 @@ public interface BomNewMbomParentMapper extends BaseMapper<BomNewMbomParentEntit
      */
     Page<BomNewMbomMiddleVO> indexListPage(Page<BomNewMbomMiddleVO> page, @Param("query") BomNewMbomParentQuery query );
 
+    /**
+     * 递归向上查找所有数据
+     * @param rowId 当前行
+     * @return
+     */
     List<BomNewMbomMiddleVO> searchList(@Param("rowId")  Long rowId );
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java
index 343a8f35..b018f890 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java
@@ -8,6 +8,9 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * t_bom_new_mbom_parent 
@@ -201,7 +204,20 @@ public class BomNewMbomMiddleVO extends BaseMaterialVO implements Serializable {
     @ApiModelProperty(value = "是否虚拟件 0-否 1-是")
     private Integer virtualPartIs;
 
+    @ApiModelProperty(value = "是否有下级 0-否 1-是")
+    private Integer bomExist;
+    public Integer getBomExist(){
+        if(Objects.isNull(bomExist)){
+            return 0;
+        }
+        if(bomExist>0){return  1;}
+        return  0;
+    }
 
 
 
+
+
+    private List<BomNewMbomMiddleVO> childNodes = Collections.emptyList();
+
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
index eda0fa6b..24793bbe 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml
@@ -114,7 +114,7 @@
 
     <select id="searchList" resultType="com.nflg.product.bomnew.pojo.vo.BomNewMbomMiddleVO">
         <![CDATA[
-     SELECT t2.*
+     SELECT t2.*,(SELECT count(1) from t_bom_new_mbom_detail where parent_id=t2.row_id) as bomExist
         FROM
         (
         SELECT