From ff26f25a9979199d1dab35a7c5cdebbbcf56618c Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 7 Nov 2024 14:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/basic/mapper/TbPeopleMapper.java     |  2 -
 .../service/impl/TbPeopleServiceImpl.java     | 53 ++++++++++---------
 .../mapper/base/basic/TbPeopleMapper.xml      | 15 +-----
 3 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/mapper/TbPeopleMapper.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/mapper/TbPeopleMapper.java
index 26b6b89..01b79cd 100644
--- a/bonus-modules/base/src/main/java/com/bonus/base/basic/mapper/TbPeopleMapper.java
+++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/mapper/TbPeopleMapper.java
@@ -80,7 +80,5 @@ public interface TbPeopleMapper {
      * @return
      */
     SysUser getUserById(Long userId);
-
-    TbPeople queryByName1(TbPeopleDto tbPeople);
 }
 
diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java
index c7749b5..a7a03dc 100644
--- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java
+++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java
@@ -383,30 +383,35 @@ public class TbPeopleServiceImpl implements TbPeopleService {
             List<TbPeopleDto> tbPeopleList = util.importExcel(file.getInputStream());
             int result = 0;
             for (TbPeopleDto tbPeople : tbPeopleList) {
-                //List<TbPeople> peopleList = tbPeopleDao.queryByName(tbPeople);
-                TbPeople people = tbPeopleDao.queryByName1(tbPeople);
-                if (people != null) {
-                    //进行更新操作
-                    TbPeople dto = new TbPeople();
-                    dto.setId(people.getId());
-                    dto.setUpdateUser(SecurityUtils.getUserId());
-                    dto.setDelFlag(0);
-                    dto.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
-                    dto.setIdCard(tbPeople.getIdCard());
-                    dto.setSex(tbPeople.getGender());
-                    dto.setRelName(tbPeople.getRelName());
-                    dto.setPostCode(tbPeople.getPostCode());
-                    result += tbPeopleDao.update(dto);
-                } else {
-                    //新增操作
-                    TbPeople dto = new TbPeople();
-                    dto.setCreateUser(SecurityUtils.getUserId());
-                    dto.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
-                    dto.setIdCard(tbPeople.getIdCard());
-                    dto.setSex(tbPeople.getGender());
-                    dto.setRelName(tbPeople.getRelName());
-                    dto.setPostCode(tbPeople.getPostCode());
-                    result += tbPeopleDao.insert(dto);
+                List<TbPeople> peopleList = tbPeopleDao.queryByName(tbPeople);
+                if (CollectionUtils.isNotEmpty(peopleList)) {
+                    for (TbPeople people : peopleList) {
+                        if (StringUtils.isNotBlank(people.getIdCard()) && StringUtils.isNotBlank(tbPeople.getIdCard())) {
+                            if (Objects.equals(Sm4Utils.decode(people.getIdCard()), tbPeople.getIdCard())) {
+                                //进行更新操作
+                                TbPeople dto = new TbPeople();
+                                dto.setId(people.getId());
+                                dto.setUpdateUser(SecurityUtils.getUserId());
+                                dto.setDelFlag(0);
+                                dto.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
+                                dto.setIdCard(Sm4Utils.encode(tbPeople.getIdCard()));
+                                dto.setSex(tbPeople.getGender());
+                                dto.setRelName(tbPeople.getRelName());
+                                dto.setPostCode(tbPeople.getPostCode());
+                                result += tbPeopleDao.update(dto);
+                            } else {
+                                //新增操作
+                                TbPeople dto = new TbPeople();
+                                dto.setCreateUser(SecurityUtils.getUserId());
+                                dto.setRelPhone(Sm4Utils.encode(tbPeople.getRelPhone()));
+                                dto.setIdCard(Sm4Utils.encode(tbPeople.getIdCard()));
+                                dto.setSex(tbPeople.getGender());
+                                dto.setRelName(tbPeople.getRelName());
+                                dto.setPostCode(tbPeople.getPostCode());
+                                result += tbPeopleDao.insert(dto);
+                            }
+                        }
+                    }
                 }
             }
             if (result > 0) {
diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml
index c439f56..882dc42 100644
--- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml
+++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml
@@ -156,19 +156,6 @@
     <select id="getUserById" resultType="com.bonus.system.api.domain.SysUser">
         select user_id as userId, user_name as userName, password as password from sys_user where user_id = #{userId}
     </select>
-    <select id="queryByName1" resultType="com.bonus.base.basic.domain.TbPeople">
-        select tp.id          as id,
-        tp.team_id     as teamId,
-        tp.rel_name    as relName,
-        tp.rel_phone   as relPhone,
-        tp.id_card     as idCard,
-        tp.post_code   as postCode,
-        tp.sex         as sex
-        from tb_people tp
-        where tp.del_flag = '0'
-        <if test="idCard != null and idCard != ''">
-            and tp.id_card = #{idCard}
-        </if>
-    </select>
+
 </mapper>