Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -238,6 +238,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
             List<StudentAttendance> courseStudentAttendances = courseStudentAttendancesMap.get(courseScheduleTeacherSalary.getCourseScheduleId());
             int normalStudentNum=0;
+            if(CollectionUtils.isEmpty(courseStudentAttendances)){
+                return;
+            }
             for (StudentAttendance courseStudentAttendance : courseStudentAttendances) {
                 if(courseStudentAttendance.getStatus().equals(StudentAttendanceStatusEnum.NORMAL)){
                     normalStudentNum+=1;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -3056,6 +3056,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Override
     public List<PracticeCourseDto> findUserHistoryBuyPracticeGroups(Integer userId) {
         List<PracticeCourseDto> userPracticeGroups = practiceGroupDao.findUserBuyPracticeGroups(userId);
+        if(CollectionUtils.isEmpty(userPracticeGroups)){
+            return new ArrayList<>();
+        }
         SysConfig practiceCourseMinutesConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_MINUTES);
         Integer practiceCourseMinutes = practiceCourseMinutesConfig.getParanValue(Integer.class);
         for (PracticeCourseDto userPracticeGroup : userPracticeGroups) {
@@ -3072,7 +3075,17 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
             userPracticeGroup.setDrillTimesJson(coursesArry.toJSONString());
         }
-        return userPracticeGroups;
+        Map<GroupStatusEnum, List<PracticeCourseDto>> statusGroupMap = userPracticeGroups.stream().collect(Collectors.groupingBy(PracticeCourseDto::getGroupStatus));
+        List<PracticeCourseDto> newPracticeGroups = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(statusGroupMap.get(GroupStatusEnum.LOCK))){
+            newPracticeGroups.addAll(statusGroupMap.get(GroupStatusEnum.LOCK));
+        }
+        for (PracticeCourseDto userPracticeGroup : userPracticeGroups) {
+            if (!userPracticeGroup.getGroupStatus().equals(GroupStatusEnum.LOCK)){
+                newPracticeGroups.add(userPracticeGroup);
+            }
+        }
+        return newPracticeGroups;
     }
 
     @Override