Merge branch 'teacher_income'

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

@@ -2165,7 +2165,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 //如果是已结算课程，则需要处理扣减原因
                 if(Objects.nonNull(oldSalary)){
                     //判断课程是否在试用期内
-                    boolean trail = StringUtils.isBlank(teacherSalary.getDeductionReason())||teacherSalary.getDeductionReason().indexOf("未转正")!=-1;
+                    boolean trail = StringUtils.isBlank(teacherSalary.getDeductionReason())&&teacherSalary.getDeductionReason().indexOf("未转正")!=-1;
 
                     //如果上课日期在试用期内按80%结算
                     if(trail){