修改

blade-service/blade-client/src/main/java/org/springblade/client/school/service/impl/SchoolTeacherServiceImpl.java

@@ -285,7 +285,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 	public SchoolTeacher getConfigMessage(SchoolTeacher schoolTeacher){
 		//获取工资拨付标准 公办用职称查询 其他用校龄查询
 		if (!schoolTeacher.getInSection().equals("高中部")){
-			if (!schoolTeacher.getSalaryWithdrawalStandardName().contains("公办")){
+			if (StringUtils.isNotBlank(schoolTeacher.getSalaryWithdrawalStandardName()) && !schoolTeacher.getSalaryWithdrawalStandardName().contains("公办")){
 				//非公办教师查询按校龄查询 查询不到按最大的校龄取值
 				SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
 					schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
@@ -330,7 +330,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				}
 			}
 		}else {
-			if (!schoolTeacher.getSalaryWithdrawalStandardName().contains("公办")){
+			if (StringUtils.isNotBlank(schoolTeacher.getSalaryWithdrawalStandardName()) && !schoolTeacher.getSalaryWithdrawalStandardName().contains("公办")){
 				//非公办教师查询按校龄查询 查询不到按最大的校龄取值
 				SchoolConfigItem configMessage = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(),
 					schoolTeacher.getInSection(), schoolTeacher.getSalaryWithdrawalStandardName(),
@@ -375,7 +375,7 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				}
 			}
 		}
-		if (schoolTeacher.getSalaryWithdrawalStandard() != null && schoolTeacher.getStaffType().equals("非教师")){
+		if (schoolTeacher.getSalaryWithdrawalStandard() != null && StringUtils.isNotBlank(schoolTeacher.getStaffType()) && schoolTeacher.getStaffType().equals("非教师")){
 			schoolTeacher.setSalaryWithdrawalStandard(schoolTeacher.getSalaryWithdrawalStandard().multiply(new BigDecimal(0.8)));
 		}
 		//获取职级拨付标准 按校龄取值 查询不到不赋值