From 118b059a1968114eed7e9e536d114aa54569d151 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 9 Oct 2024 14:54:12 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/base/mapper/TbTeamMapper.java   | 14 ++++++++
 .../service/impl/TbPeopleServiceImpl.java     | 10 ++++++
 .../resources/mapper/base/TbTeamMapper.xml    | 35 +++++++++++++++++++
 3 files changed, 59 insertions(+)

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 5a61ff6..2417f3b 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
@@ -138,5 +138,19 @@ public interface TbTeamMapper {
      * @return
      */
     Long selectByDevId(Long id);
+
+    /**
+     * 根据id查询班组信息
+     * @param id
+     * @return
+     */
+    TbTeam selectById(Long id);
+
+    /**
+     * 根据班组长id修改班组信息
+     * @param id
+     * @return
+     */
+    int editPeople(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 da1332c..5aa0fc4 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
@@ -6,7 +6,9 @@ import com.bonus.base.config.Constants;
 import com.bonus.base.config.ExceptionEnum;
 import com.bonus.base.domain.TbPeople;
 import com.bonus.base.domain.TbPeopleDto;
+import com.bonus.base.domain.TbTeam;
 import com.bonus.base.mapper.TbPeopleMapper;
+import com.bonus.base.mapper.TbTeamMapper;
 import com.bonus.base.service.TbPeopleService;
 import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.utils.encryption.Sm4Utils;
@@ -55,6 +57,9 @@ public class TbPeopleServiceImpl implements TbPeopleService {
     @Resource
     private TbPeopleMapper tbPeopleDao;
 
+    @Resource
+    private TbTeamMapper tbTeamDao;
+
     /**
      * 通过ID查询单条数据
      *
@@ -164,6 +169,11 @@ public class TbPeopleServiceImpl implements TbPeopleService {
         tbPeople.setUpdateUser(SecurityUtils.getUserId());
         tbPeople.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
         int result = tbPeopleDao.update(tbPeople);
+        //根据人员id去班组表中修改人员信息，先根据人员id去班组表中查询
+        TbTeam tbTeam = tbTeamDao.selectById(tbPeople.getId());
+        if (tbTeam != null) {
+            result += tbTeamDao.editPeople(tbPeople.getId());
+        }
         if (result > 0) {
             return AjaxResult.success(ExceptionEnum.SUCCESS.getMsg(), result);
         }
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 6108346..e38ad19 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
@@ -241,6 +241,23 @@
         WHERE id = #{id}
     </update>
 
+    <update id="editPeople">
+        update tb_team
+        <set>
+            <if test="relName != null and relName != ''">
+                rel_name = #{relName},
+            </if>
+            <if test="relPhone != null and relPhone != ''">
+                rel_phone = #{relPhone},
+            </if>
+            update_time = NOW(),
+            <if test="updateUser != null">
+                update_user = #{updateUser},
+            </if>
+        </set>
+        where rel_id = #{id}
+    </update>
+
     <select id="getTeamJoinPersonListByProId" resultType="com.bonus.screen.vo.TeamJoinPersonVo">
         SELECT
             t.id AS teamId, t.team_name AS teamName, p.id AS peopleId, p.rel_name AS peopleName, p.rel_phone as peoplePhone
@@ -267,5 +284,23 @@
             tt.id = #{id}
     </select>
 
+    <select id="selectById" 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>