|
@@ -618,7 +618,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
dataList.forEach(e -> {
|
|
|
param.put("musicGroupId", e.getMusicGroupId());
|
|
|
e.setAttendanceNum(teacherPersonalAttendancesCount);
|
|
|
- e.setHasRestClass(hasRestClassMap.get(Integer.parseInt(e.getClassGroupIds())).intValue());
|
|
|
+ Long aLong = hasRestClassMap.get(Integer.parseInt(e.getClassGroupIds()));
|
|
|
+ if(aLong != null){
|
|
|
+ e.setHasRestClass(aLong.intValue());
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
if (count == 0) {
|