|
@@ -1547,11 +1547,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
if(teacherDefaultMusicGroupSalary == null){
|
|
|
throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
|
|
|
}
|
|
|
- if (teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
|
|
|
+ if ((teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary() == null
|
|
|
|| teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary() == null
|
|
|
|| teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() == null
|
|
|
- || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null
|
|
|
- || teacherDefaultMusicGroupSalary.getSalaryRuleJson() == null) {
|
|
|
+ || teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() == null)
|
|
|
+ && teacherDefaultMusicGroupSalary.getSalaryRuleJson() == null) {
|
|
|
throw new BizException("请设置"+teacher.getRealName()+"老师的"+classGroup4MixDto.getCourseType().getMsg()+"课酬");
|
|
|
}
|
|
|
|