|
@@ -85,11 +85,17 @@ public class StudentManageServiceImpl implements StudentManageService {
|
|
|
List<Integer> userIds = dataList.stream()
|
|
|
.map(StudentManageListDto::getUserId).collect(Collectors.toList());
|
|
|
List<SysUserCashAccount> byUserIds = sysUserCashAccountDao.findByUserIds(userIds);
|
|
|
- Map<Integer,Long> hasCourseMap = MapUtil.convertIntegerMap(studentManageDao.queryStudentHasCourse(userIds));
|
|
|
+// Map<Integer,Long> hasCourseMap = MapUtil.convertIntegerMap(studentManageDao.queryStudentHasCourse(userIds));
|
|
|
Map<Integer, SysUserCashAccount> collect = byUserIds.stream()
|
|
|
.collect(Collectors.toMap(SysUserCashAccount::getUserId, sysUserCashAccount -> sysUserCashAccount));
|
|
|
dataList.forEach(e -> {
|
|
|
- e.setHasCourse(hasCourseMap.get(e.getUserId()));
|
|
|
+ if(hasCourse != null){
|
|
|
+ e.setHasCourse(studentManageDao.getHasCourse(e.getUserId()));
|
|
|
+ }else if(hasCourse){
|
|
|
+ e.setHasCourse(1L);
|
|
|
+ }else {
|
|
|
+ e.setHasCourse(0L);
|
|
|
+ }
|
|
|
if(collect.get(e.getUserId()) != null){
|
|
|
e.setCourseBalance(collect.get(e.getUserId()).getCourseBalance());
|
|
|
}
|