Merge branch 'teacher_client_salary'

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

@@ -1625,7 +1625,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             }
 
             teacherSalary = teacherSalary.add(subsidy);
-            teacherSalary = teacherSalary.add(subsidy);
             if(BigDecimal.ZERO.compareTo(teacherSalary)>0){
                 teacherSalary = new BigDecimal(0);
             }
@@ -2410,9 +2409,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
         List<LocalDateBigDecimalMapDto> monthIncomeMapList = courseScheduleTeacherSalaryDao.teacherIncomeStat(teacherId, year, month);
 
-        if(CollectionUtils.isEmpty(monthIncomeMapList)){
-            return result;
-        }
+//        if(CollectionUtils.isEmpty(monthIncomeMapList)){
+//            return result;
+//        }
 
         if(Objects.isNull(month)){
             Set<String> months = monthIncomeMapList.stream().map(e -> DateUtil.dateToString(e.getDate(), "yyyy-MM")).collect(Collectors.toSet());