From 7d27c3407266d88f2613aef2d0cc5df54d83988d Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 21 Dec 2023 16:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/sgzb/system/domain/TreeNode.java | 3 +++
 .../src/main/resources/mapper/system/SelectMapper.xml        | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
index 01b73bd7..a69aaa12 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
@@ -19,6 +19,9 @@ public class TreeNode {
 
     private long parentId;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String level;
+
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeNode> children = new ArrayList<>();
 }
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
index f6af78d1..4f7ef4fa 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -129,14 +129,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT pro_id AS id,
                pro_name AS `name`
         FROM bm_project_info
-        WHERE del_flag = '0'
+        WHERE del_flag = '0' AND status = '0'
         ORDER BY create_time
     </select>
     <!--配件所属上级树-->
     <select id="getAccessoryTree" resultType="com.bonus.sgzb.system.domain.TreeNode">
         SELECT pa_id AS id,
                pa_name AS label,
-               parent_id AS parentId
+               parent_id AS parentId,
+               level
         FROM ma_part_type
         WHERE del_flag = '0'
         ORDER BY create_time