|
|
@@ -584,7 +584,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
Map<Integer, String> idNameMap=new HashMap<>();
|
|
|
if(!CollectionUtils.isEmpty(educationalTeacherIds)){
|
|
|
List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
|
|
|
- idNameMap = educationalUsers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
|
|
|
+ idNameMap = educationalUsers.stream().filter(e->Objects.nonNull(e.getUserId())&&Objects.nonNull(e.getUserName())).collect(Collectors.toMap(SimpleUserDto::getUserId, user -> user.getUserName()));
|
|
|
}
|
|
|
|
|
|
for (VipGroup vipGroup : dataList) {
|
Joburgess