From ce1dacd02320a397b04834ed380d742be4578878 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 13 Aug 2024 18:13:51 +0800
Subject: [PATCH] =?UTF-8?q?APP-=E5=90=8A=E8=A3=85=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bracelet/service/impl/ConsControlServiceImpl.java      | 2 +-
 .../main/resources/mapper/bracelet/ConsControlMapper.xml   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
index 64ee3ef..ddc4fc6 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
@@ -207,7 +207,7 @@ public class ConsControlServiceImpl implements IConsControlService {
             list = mapper.getTeamPersonByTower(dto);
             for (TeamPeopleTreeVo vo : list) {
                 //忽略工程数据
-                if (Objects.equals(vo.getParentId(), BusinessConstants.PARENT_ID)) {
+                if (Objects.equals(vo.getParentId(), BusinessConstants.PARENT_ID) || Objects.equals(vo.getId(), BusinessConstants.PARENT_ID)) {
                     continue;
                 }
                 String[] valArr = vo.getLabel().split("-");
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 23139d6..823772a 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
@@ -305,6 +305,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <!--根据杆塔获取班组人员-已绑定手环-->
     <select id="getTeamPersonByTower" resultType="com.bonus.common.entity.bracelet.vo.TeamPeopleTreeVo">
+        SELECT 0 AS id,
+               '在施班组及人员' AS label,
+               -1 AS parentId,
+               null AS shCode,
+               null AS devCode,
+               null AS userType
+    UNION ALL
         SELECT twt.team_id AS id,
                twt.team_name AS label,
                0 AS parentId,