|
|
@ -236,7 +236,7 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck |
|
|
|
return receiveV2Dto; |
|
|
|
} |
|
|
|
List<BsSgcDfManateam> list = bsSgcDfManateamService.list(new LambdaQueryWrapper<BsSgcDfManateam>() |
|
|
|
.eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber()) |
|
|
|
.eq(StringUtils.isNotBlank(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber()) |
|
|
|
); |
|
|
|
if (CollectionUtils.isEmpty(list)) { |
|
|
|
return receiveV2Dto; |
|
|
@ -248,7 +248,6 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck |
|
|
|
.in(DwCheckingV2ProjectManage::getDikeCode, list.stream() |
|
|
|
.map(BsSgcDfManateam::getDikeCode) |
|
|
|
.collect(Collectors.toList()))); |
|
|
|
manageList = StreamUtils.distinctByKeyFast(manageList, DwCheckingV2ProjectManage::getDikeCode); |
|
|
|
Map<String, String> personNameList = list.stream() |
|
|
|
.collect(Collectors.toMap(BsSgcDfManateam::getDikeCode, BsSgcDfManateam::getPersonName)); |
|
|
|
receiveV2Dto.setDropDownList(manageList.stream().map(e -> { |
|
|
|