From 8bbbfb60feddfd0bee73efa462be5ffc5eafd9ed Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 15 Aug 2024 16:44:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=BD=E5=B7=A5=E7=AE=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/entity/bracelet/vo/PersonTreeVo.java   |  3 +++
 .../mapper/bracelet/ConsControlMapper.xml         | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonTreeVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonTreeVo.java
index 9cdddd6..c3e94b5 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonTreeVo.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/PersonTreeVo.java
@@ -26,6 +26,9 @@ public class PersonTreeVo {
 
     /**层级*/
     private Integer level;
+
+    /**人员类型 0.班组人员 1.临时人员*/
+    private Integer type;
     /**父ID*/
     private String parentId;
 
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml
index 823772a..b0f7fb9 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml
@@ -132,7 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  0 AS parentId,
                  1 AS level,
                  0 AS isTeamLeader,
-                 0 AS isWarn
+                 0 AS isWarn,
+                 0 AS type
           FROM tb_project tp
           WHERE tp.del_flag = 0
         UNION ALL
@@ -142,7 +143,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  tpp.pro_id AS parentId,
                  2 AS level,
                  0 AS isTeamLeader,
-                 0 AS isWarn
+                 0 AS isWarn,
+                 0 AS type
           FROM tb_project_power tpp
           LEFT JOIN tb_project tp ON tpp.pro_id = tp.id AND tp.del_flag = 0
           WHERE tpp.del_flag = 0
@@ -153,7 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  CONCAT('tower','-',tdu.gt_id) AS parentId,
                  3 AS level,
                  0 AS isTeamLeader,
-                 0 AS isWarn
+                 0 AS isWarn,
+                 0 AS type
           FROM tb_dev_use tdu
           LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id
           LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0
@@ -166,7 +169,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  CONCAT('team','-',tpe.team_id) AS parentId,
                  4 AS level,
                  IF(twt.team_leader_id = tpe.id,1,0) AS isTeamLeader,
-                 0 AS isWarn
+                 0 AS isWarn,
+                 0 AS type
           FROM tb_dev_use tdu
           LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id
           LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0
@@ -180,7 +184,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             CONCAT('team','-',tlu.team_id) AS parentId,
             4 AS level,
             0 AS isTeamLeader,
-            0 AS isWarn
+            0 AS isWarn,
+            1 AS type
             FROM tb_dev_use tdu
             LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id
             LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0