|
@@ -86,7 +86,7 @@ public class PersonRelationService extends ServiceImpl<PersonRelationMapper, Per
|
|
|
if (personRelations == null | personRelations.isEmpty()) {
|
|
|
return personnelVOS;
|
|
|
}
|
|
|
- List<Integer> personIds = personRelations.stream().map(PersonRelation::getPersonId1).collect(Collectors.toList());
|
|
|
+ List<Integer> personIds = personRelations.stream().map(PersonRelation::getPersonId2).collect(Collectors.toList());
|
|
|
LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.in(Personnel::getId, personIds);
|
|
|
List<Personnel> personnel = personnelService.list(queryWrapper);
|
|
@@ -94,6 +94,7 @@ public class PersonRelationService extends ServiceImpl<PersonRelationMapper, Per
|
|
|
PersonnelVO personnelVO = new PersonnelVO();
|
|
|
personnelVO.setMobile(item.getPersonnelPhone());
|
|
|
personnelVO.setId(item.getId().toString());
|
|
|
+ personnelVO.setUsername(item.getPersonnelUserName());
|
|
|
PersonRelation personRelation = personRelations.stream().filter(tem -> tem.getPersonId1().equals(item.getId())).findFirst().orElse(null);
|
|
|
if (personRelation != null) {
|
|
|
personnelVO.setCreateTime(personRelation.getCreateTime());
|