新增IwsTeamUserVo班组集合字段,增加空值检查逻辑,修复BmTeam实体类字段注释问题
This commit is contained in:
syruan 2025-06-17 12:32:18 +08:00
parent 29501f028b
commit cd64591bd4
3 changed files with 14 additions and 3 deletions

View File

@ -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;
}

View File

@ -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())) {

View File

@ -110,4 +110,9 @@ public class BmTeam {
* 班组长账号
*/
private String idCard;
/**
* 班组长身份证号码
*/
private String teamLeaderIdCard;
}