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 projectIds; - + /** + * 班组集合 + */ private List 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 selectProjectTeamInfoByIdCard(IwsTeamUserVo dto) { + if (Objects.isNull(dto)) { + return Collections.emptyList(); + } List 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; }