From cf60d01baa0632335b59c1b565a437615fdd9624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6?= <18621965254@yeah.net>
Date: Sat, 12 Mar 2022 17:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6:=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=91=E5=AF=BC=E8=88=AA=E6=A0=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/pms/ocp/model/entity/TreeNode.java | 3 +++
 src/main/resources/mapper/ModelIssueMapper.xml       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/pms/ocp/model/entity/TreeNode.java b/src/main/java/com/pms/ocp/model/entity/TreeNode.java
index 2835e3a..445d325 100644
--- a/src/main/java/com/pms/ocp/model/entity/TreeNode.java
+++ b/src/main/java/com/pms/ocp/model/entity/TreeNode.java
@@ -34,6 +34,9 @@ public class TreeNode implements Serializable {
     @ApiModelProperty("公司编码")
     private String companyCode;
 
+    @ApiModelProperty("所属等级")
+    private int belongLevel;
+
     @ApiModelProperty("子类")
     private List<TreeNode> children;
 
diff --git a/src/main/resources/mapper/ModelIssueMapper.xml b/src/main/resources/mapper/ModelIssueMapper.xml
index a185af7..8cd5f9d 100644
--- a/src/main/resources/mapper/ModelIssueMapper.xml
+++ b/src/main/resources/mapper/ModelIssueMapper.xml
@@ -6,11 +6,11 @@
     <result column="model_group_pcode" property="pCode"/>
     <result column="group_company_code" property="companyCode"/>
     <result column="model_group_name" property="name"/>
-    <result column="modelLevel" property="belongLevel"/>
+    <result column="groupModelBelongLevel" property="belongLevel"/>
     <collection property="children" ofType="com.pms.ocp.model.entity.TreeNode">
         <result column="model_name" property="name"/>
         <result column="model_code" property="code"/>
-        <result column="groupModelBelongLevel" property="belongLevel"/>
+        <result column="modelLevel" property="belongLevel"/>
     </collection>
 </resultMap>
     <select id="selectModelAndModelGroup" parameterType="java.lang.String" resultMap="modelAndModelGroupMap">
-- 
2.26.0