修改

blade-service/blade-client/src/main/java/org/springblade/client/school/controller/SchoolTeacherController.java

@@ -94,6 +94,7 @@ public class SchoolTeacherController extends BladeController {
 		LambdaQueryWrapper<SchoolTeacher> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(SchoolTeacher::getIsDeleted,0);
 		lambdaQueryWrapper.eq(SchoolTeacher::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getStatus()),SchoolTeacher::getStatus,schoolTeacher.getStatus());//职工状态
 		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getGender()),SchoolTeacher::getGender,schoolTeacher.getGender());//性别
 		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getSchoolAge()),SchoolTeacher::getSchoolAge,schoolTeacher.getSchoolAge());//校龄
 		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getDoubleTeachers()),SchoolTeacher::getDoubleTeachers,schoolTeacher.getDoubleTeachers());//是否班主任
@@ -214,6 +215,7 @@ public class SchoolTeacherController extends BladeController {
 		lambdaQueryWrapper.eq(SchoolTeacher::getIsDeleted,0);
 		lambdaQueryWrapper.eq(SchoolTeacher::getTenantId,SecureUtil.getTenantId());
 		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getGender()),SchoolTeacher::getGender,schoolTeacher.getGender());//性别
+		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getStatus()),SchoolTeacher::getStatus,schoolTeacher.getStatus());//职工状态
 		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getSchoolAge()),SchoolTeacher::getSchoolAge,schoolTeacher.getSchoolAge());//校龄
 		lambdaQueryWrapper.eq(Func.isNotEmpty(schoolTeacher.getDoubleTeachers()),SchoolTeacher::getDoubleTeachers,schoolTeacher.getDoubleTeachers());//是否班主任
 		lambdaQueryWrapper.like(Func.isNotEmpty(schoolTeacher.getCname()),SchoolTeacher::getCname,schoolTeacher.getCname());//姓名

blade-service/blade-client/src/main/java/org/springblade/client/school/mapper/SchoolConfigItemMapper.xml

@@ -38,13 +38,13 @@
         <if test="parameter!=null and parameter != ''">
             AND ci.parameter = #{parameter}
         </if>
-        <if test="parameter==null and parameter == ''">
+        <if test="parameter==null or parameter == ''">
             AND ci.parameter IS NULL
         </if>
         <if test="salaryWithdrawalStandardName!=null and salaryWithdrawalStandardName != ''">
             AND cf.salary_withdrawal_standard_name = #{salaryWithdrawalStandardName}
         </if>
-        <if test="salaryWithdrawalStandardName==null and salaryWithdrawalStandardName == ''">
+        <if test="salaryWithdrawalStandardName==null or salaryWithdrawalStandardName == ''">
             AND cf.salary_withdrawal_standard_name = ''
         </if>
         <if test="compileCategory!=null and compileCategory != ''">
@@ -56,7 +56,7 @@
         <if test="classType!=null and classType != ''">
             AND cf.class_type = #{classType}
         </if>
-        <if test="classType==null and classType == ''">
+        <if test="classType==null or classType == ''">
             AND cf.class_type IS NULL
         </if>
 	    ORDER BY ci.salary DESC LIMIT 1

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

@@ -490,6 +490,8 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			SchoolConfigItem assessment = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "日常考核工资标准", schoolTeacher.getDailyGrade(), null,schoolTeacher.getClassType());
 			if (assessment != null){
 				schoolTeacher.setDailyAssessmentCriteria(assessment.getSalary());
+			}else {
+				schoolTeacher.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
 			}
 			//学期绩效工资标准
 			SchoolConfigItem performance = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学期绩效工资标准", schoolTeacher.getPerformanceGrade(), null,schoolTeacher.getClassType());
@@ -502,6 +504,8 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 			SchoolConfigItem assessment = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "日常考核工资标准", schoolTeacher.getDailyGrade(), null,null);
 			if (assessment != null){
 				schoolTeacher.setDailyAssessmentCriteria(assessment.getSalary());
+			}else {
+				schoolTeacher.setDailyAssessmentCriteria(new BigDecimal(BigInteger.ZERO));
 			}
 			//学期绩效工资标准
 			SchoolConfigItem performance = schoolConfigItemMapper.getConfigMessage(schoolTeacher.getTenantId(), schoolTeacher.getInSection(), null, "学期绩效工资标准", schoolTeacher.getPerformanceGrade(), null,null);