|
@@ -135,6 +135,7 @@ public class StudentManageServiceImpl implements StudentManageService {
|
|
List<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
|
|
List<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
|
|
List<Integer> courseTeacherIds = dataList.stream().map(e -> e.getCourseTeacher()).distinct().collect(Collectors.toList());
|
|
List<Integer> courseTeacherIds = dataList.stream().map(e -> e.getCourseTeacher()).distinct().collect(Collectors.toList());
|
|
organIds.removeAll(Collections.singleton(null));
|
|
organIds.removeAll(Collections.singleton(null));
|
|
|
|
+ courseTeacherIds.removeAll(Collections.singleton(null));
|
|
List<SysUserCashAccount> accounts = sysUserCashAccountDao.findByUserIds(userIds);
|
|
List<SysUserCashAccount> accounts = sysUserCashAccountDao.findByUserIds(userIds);
|
|
Map<Integer, Organization> organMap = null;
|
|
Map<Integer, Organization> organMap = null;
|
|
if(!CollectionUtils.isEmpty(organIds)){
|
|
if(!CollectionUtils.isEmpty(organIds)){
|