update

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

@@ -73,7 +73,8 @@ public class TeacherDefaultPracticeGroupSalaryServiceImpl extends BaseServiceImp
 					List<CourseScheduleTeacherSalary> list = new ArrayList<CourseScheduleTeacherSalary>();
 
 					for (CourseScheduleTeacherSalary ts : updateTeacherSalaryList) {
-						if (origSalary != null && origSalary.getMainTeacherSalary().compareTo(ts.getExpectSalary()) != 0) {
+						if (origSalary != null && origSalary.getMainTeacherSalary().compareTo(ts.getExpectSalary()) == 0
+								&& origSalary.getMainTeacherSalary().compareTo(salary) != 0) {
 							ts.setExpectSalary(salary);
 							ts.setUpdateTime(date);
 							list.add(ts);

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

@@ -156,14 +156,20 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 							TeacherDefaultVipGroupSalary tdms = salaryMap.get(vipGroup.getVipGroupCategoryId());
 							TeacherDefaultVipGroupSalary origTdms = map.get(vipGroup.getVipGroupCategoryId());
 							if (tdms != null && origTdms != null) {
-								if (vipGroupSalarySettlementDto.getOnlineSalarySettlement() != null && vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType() == SalarySettlementTypeEnum.TEACHER_DEFAULT
+								if (vipGroupSalarySettlementDto.getOnlineSalarySettlement() != null
+										&& vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType() == SalarySettlementTypeEnum.TEACHER_DEFAULT
 										&& (ts.getCourseSchedule().getTeachMode() == TeachModeEnum.ONLINE)) {// 线上课
-									if (teacher.getJobNature() != JobNatureEnum.FULL_TIME && tdms.getOnlineClassesSalary().compareTo(origTdms.getOnlineClassesSalary()) != 0) {
+									if (teacher.getJobNature() != JobNatureEnum.FULL_TIME
+											&& ts.getExpectSalary().compareTo(origTdms.getOnlineClassesSalary()) == 0
+											&& tdms.getOnlineClassesSalary().compareTo(origTdms.getOnlineClassesSalary()) != 0) {
 										ts.setExpectSalary(tdms.getOnlineClassesSalary());
 										list.add(ts);
 									}
-								} else if (vipGroupSalarySettlementDto.getOfflineSalarySettlement() != null && vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType() == SalarySettlementTypeEnum.TEACHER_DEFAULT
-										&& ts.getCourseSchedule().getTeachMode() == TeachModeEnum.OFFLINE && tdms.getOnlineClassesSalary().compareTo(origTdms.getOnlineClassesSalary()) != 0) {// 线下课
+								} else if (vipGroupSalarySettlementDto.getOfflineSalarySettlement() != null
+										&& vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType() == SalarySettlementTypeEnum.TEACHER_DEFAULT
+										&& ts.getCourseSchedule().getTeachMode() == TeachModeEnum.OFFLINE
+										&& ts.getExpectSalary().compareTo(origTdms.getOnlineClassesSalary()) == 0
+										&& tdms.getOnlineClassesSalary().compareTo(origTdms.getOnlineClassesSalary()) != 0) {// 线下课
 									ts.setExpectSalary(tdms.getOfflineClassesSalary());
 									list.add(ts);
 								}