|
|
@@ -476,7 +476,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
|
|
|
schoolTeacher.setCapitalIncrease(capitalIncreaseName.getSalary());
|
|
|
}
|
|
|
//履约奖标准
|
|
|
- if (StringUtils.isNotBlank(schoolTeacher.getEnjoyOfficeTreatment()) && schoolTeacher.getEnjoyOfficeTreatment().equals("是")) {
|
|
|
+ if (StringUtils.isBlank(schoolTeacher.getEnjoyOfficeTreatment()) || !schoolTeacher.getEnjoyOfficeTreatment().equals("是")) {
|
|
|
SchoolConfigItem performanceAward = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", schoolTeacher.getSchoolAge().toString(), null,null);
|
|
|
if (performanceAward == null){
|
|
|
SchoolConfigItem performanceAwardName = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "履约奖标准", null, null,null);
|