From 014c2cbff9491d0bf5b5f20f2fd99fa87a87b900 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 10 Oct 2024 09:12:51 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/base/mapper/TbTeamMapper.java    |  7 +++++++
 .../base/service/impl/TbPeopleServiceImpl.java |  4 ++--
 .../resources/mapper/base/TbTeamMapper.xml     | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java
index 309f971..7ebf7f6 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java
@@ -152,5 +152,12 @@ public interface TbTeamMapper {
      * @return
      */
     int editPeople(TbPeople tbPeople);
+
+    /**
+     * 根据id查询集合班组信息
+     * @param id
+     * @return
+     */
+    List<TbTeam> selectListById(Long id);
 }
 
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java
index e1d0b6d..272dd2b 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java
@@ -170,8 +170,8 @@ public class TbPeopleServiceImpl implements TbPeopleService {
         tbPeople.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
         int result = tbPeopleDao.update(tbPeople);
         //根据人员id去班组表中修改人员信息，先根据人员id去班组表中查询
-        TbTeam tbTeam = tbTeamDao.selectById(tbPeople.getId());
-        if (tbTeam != null) {
+        List<TbTeam> tbTeamList = tbTeamDao.selectListById(tbPeople.getId());
+        if (CollectionUtils.isNotEmpty(tbTeamList)) {
             result += tbTeamDao.editPeople(tbPeople);
         }
         if (result > 0) {
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml
index 5cdba13..4c72288 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml
@@ -304,5 +304,23 @@
           AND rel_id = #{id}
     </select>
 
+    <select id="selectListById" resultType="com.bonus.base.domain.TbTeam">
+        select id        as id,
+               team_name as teamName,
+               rel_id    as relId,
+               rel_name  as relName,
+               rel_phone as relPhone,
+               pro_id as proId,
+               pro_name as proName,
+               create_time as createTime,
+               create_user as createUser,
+               update_time as updateTime,
+               js_time as jsTime,
+               update_user as updateUser,
+               del_flag as delFlag
+        from tb_team
+        where rel_id = #{id}
+    </select>
+
 </mapper>