Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -321,10 +321,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		LocalDate nowDate = LocalDate.now();
 		
 		List<Organization> allOrgans = organizationService.findAllOrgans(tenantId);
-		if(CollectionUtils.isEmpty(this.organIds.get())){
-			this.organIds.get().clear();
-			this.organIds.get().addAll(allOrgans.stream().map(Organization::getId).collect(Collectors.toSet()));
-		}
+		this.organIds.get().clear();
+		this.organIds.get().addAll(allOrgans.stream().map(Organization::getId).collect(Collectors.toSet()));
 
 		if(StringUtils.isBlank(dayStr)){
 			dayStr = nowDate.plusDays(-1).toString();

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

@@ -768,6 +768,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 studentPaymentOrder.setClassGroupId(206);
             }
             studentPaymentOrderService.update(studentPaymentOrder);
+            studentPaymentOrder.setVersion(studentPaymentOrder.getVersion() + 1);
         }
         return studentPaymentOrder;
     }

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

@@ -402,10 +402,6 @@ public class StudentServeServiceImpl implements StudentServeService {
             	}
             }
             
-            if(userId == 2163133){
-            	System.out.println("********************");
-            }
-            
             //有未上的单技课
             if(typeCourseMap.containsKey(CourseSchedule.CourseScheduleType.SINGLE) && isServiceWithMusicGroup){
                 
@@ -603,10 +599,6 @@ public class StudentServeServiceImpl implements StudentServeService {
                 continue;
             }
             
-            if(noCourseServeStudentId == 2163133){
-            	System.out.println("********************");
-            }
-        	
             Map<Integer, Integer> teacherNumMap = new HashMap<>();
             for (String groupId : musicGroupIds) {
             	
@@ -674,7 +666,6 @@ public class StudentServeServiceImpl implements StudentServeService {
                         .collect(Collectors.groupingBy(StudentServeCourseHomeworkDto::getUserId));
             }
 
-
             List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allStudentIds), TenantContextHolder.getTenantId());
             if(!CollectionUtils.isEmpty(allStudentExercises)){
                 studentExercisesMap = allStudentExercises.stream().collect(Collectors.groupingBy(ExtracurricularExercisesReply::getUserId));