|
@@ -78,11 +78,9 @@ public class MusicGroupQuitController extends BaseController {
|
|
|
|
|
|
if (musicGroupQuitPageInfo.getRows() != null && musicGroupQuitPageInfo.getRows().size() > 0) {
|
|
|
//查询是否有有效期内乐保
|
|
|
- List<Integer> studentIds = musicGroupQuitPageInfo.getRows().stream().map(MusicGroupQuit::getUserId).collect(Collectors.toList());
|
|
|
- List<StudentInstrument> studentsMaintenanceNum = studentInstrumentDao.getStudentsMaintenanceNum(studentIds);
|
|
|
- Map<Integer, Integer> studentMaintenanceMap = studentsMaintenanceNum.stream().collect(Collectors.toMap(StudentInstrument::getStudentId, StudentInstrument::getGoodsId));
|
|
|
for (MusicGroupQuit row : musicGroupQuitPageInfo.getRows()) {
|
|
|
- if (studentMaintenanceMap.containsKey(row.getUserId())) {
|
|
|
+ StudentInstrument studentMaintenance = studentInstrumentDao.getStudentMaintenance(row.getUserId(), row.getMusicGroupId());
|
|
|
+ if (studentMaintenance != null) {
|
|
|
row.setHasMaintenance(true);
|
|
|
}
|
|
|
}
|