From cd64591bd4cf3ad872b1ad047674d7d11e88bda6 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Tue, 17 Jun 2025 12:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=96=B0=E5=A2=9EIwsTeamU?=
 =?UTF-8?q?serVo=E7=8F=AD=E7=BB=84=E9=9B=86=E5=90=88=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=A9=BA=E5=80=BC=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE=E5=A4=8DBmTeam=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5=E6=B3=A8=E9=87=8A=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/app/domain/IwsTeamUserVo.java   | 6 ++++--
 .../material/app/service/impl/IwsTeamUserServiceImpl.java   | 6 +++++-
 .../main/java/com/bonus/material/basic/domain/BmTeam.java   | 5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/domain/IwsTeamUserVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/domain/IwsTeamUserVo.java
index 7aa1cbc7..7b01c388 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/domain/IwsTeamUserVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/domain/IwsTeamUserVo.java
@@ -18,7 +18,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true) // 继承父类字段
-public class IwsTeamUserVo extends IwsUserBean{
+public class IwsTeamUserVo extends IwsUserBean {
 
     /**
      * 主键
@@ -95,6 +95,8 @@ public class IwsTeamUserVo extends IwsUserBean{
      */
     private List<String> projectIds;
 
-
+    /**
+     * 班组集合
+     */
     private List<IwsTeamUserVo> teamList;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/impl/IwsTeamUserServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/impl/IwsTeamUserServiceImpl.java
index d0b2fa19..2fb68983 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/impl/IwsTeamUserServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/app/service/impl/IwsTeamUserServiceImpl.java
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -57,11 +58,14 @@ public class IwsTeamUserServiceImpl implements IwsTeamUserService {
     /**
      * 根据身份证号码查询用户所属班组及工程信息
      *
-     * @param dto
+     * @param dto 请求参数
      * @return List集合
      */
     @Override
     public List<IwsTeamUserVo> selectProjectTeamInfoByIdCard(IwsTeamUserVo dto) {
+        if (Objects.isNull(dto)) {
+            return Collections.emptyList();
+        }
         List<IwsTeamUserVo> iwsTeamUserVos = iwsTeamUserMapper.selectProjectTeamInfoByIdCard(dto.getIdCard());
         if (iwsTeamUserVos.isEmpty()) {
             if (CollectionUtils.isEmpty(dto.getProjectIds())) {
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmTeam.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmTeam.java
index 48a6ded9..897f92d5 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmTeam.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmTeam.java
@@ -110,4 +110,9 @@ public class BmTeam {
      * 班组长账号
      */
     private String idCard;
+
+    /**
+     * 班组长身份证号码
+     */
+    private String teamLeaderIdCard;
 }