From 31ffacfc0431124668bea435c979d267d731b769 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 21 Dec 2023 16:34:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89-=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=A0=91=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          | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 a69aaa12..b723e1a3 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
@@ -22,6 +22,9 @@ public class TreeNode {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String level;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String unitName;
+
     @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 4f7ef4fa..7cafc185 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
@@ -92,7 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getDeviceTypeTree" resultType="com.bonus.sgzb.system.domain.TreeNode">
         SELECT type_id AS id,
                type_name AS label,
-               parent_id AS parentId
+               parent_id AS parentId,
+               unit_name AS unitName
         FROM ma_type
         WHERE del_flag = '0'
         <if test="level!=null and level!=''">