zouxuan 5 年之前
父节点
当前提交
c1966bcef9

+ 3 - 5
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1533,11 +1533,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             if(schedule.getGroupType() == MUSIC){
                 Set<Long> collect = truantStudent.stream().map(e -> e.getStudentId()).collect(Collectors.toSet());
                 Map<Integer,String> paymentStatusMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryUserCoursePaymentStatus(collect,schedule.getMusicGroupId()));
-                if(paymentStatusMap.size() > 0){
-                    truantStudent.forEach(studentAttendanceViewDto -> {
-                        studentAttendanceViewDto.setPaymentStatus(paymentStatusMap.get(studentAttendanceViewDto.getStudentId().intValue()));
-                    });
-                }
+                truantStudent.forEach(studentAttendanceViewDto -> {
+                    studentAttendanceViewDto.setPaymentStatus(paymentStatusMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                });
             }
             List<StudentAttendanceViewDto> tempIds = truantStudent.stream()
                     .filter(studentAttendanceViewDto -> studentAttendanceViewDto.getGroupType().equals("MUSIC"))

+ 3 - 5
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentAttendanceServiceImpl.java

@@ -604,11 +604,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
             if(schedule.getGroupType() == GroupType.MUSIC){
                 Set<Integer> collect = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
                 Map<Integer,String> paymentStatusMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryUserCoursePaymentStatus(collect,schedule.getMusicGroupId()));
-                if(paymentStatusMap.size() > 0){
-                    dataList.forEach(e -> {
-                        e.setPaymentStatus(paymentStatusMap.get(e.getUserId()));
-                    });
-                }
+                dataList.forEach(e -> {
+                    e.setPaymentStatus(paymentStatusMap.get(e.getUserId()));
+                });
             }
         }
         if (count == 0) {