|
@@ -140,6 +140,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
|
|
|
if (rows != null && rows.size() > 0) {
|
|
|
Set<Integer> organIds = rows.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
|
|
|
List<Integer> userIds = rows.stream().map(e -> e.getUserId()).collect(Collectors.toList());
|
|
|
+ if(userIds == null){
|
|
|
+ userIds = new ArrayList<>();
|
|
|
+ }
|
|
|
Set<Integer> operatorIds = rows.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet());
|
|
|
Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds, ",")));
|
|
|
Map<Integer, String> operatorNames = MapUtil.convertMybatisMap(teacherDao.queryNameByIds(StringUtils.join(operatorIds, ",")));
|