学校修改

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

@@ -42,19 +42,19 @@
             AND cf.salary_withdrawal_standard_name = #{salaryWithdrawalStandardName}
         </if>
         <if test="salaryWithdrawalStandardName==null or salaryWithdrawalStandardName == ''">
-            AND cf.salary_withdrawal_standard_name = ''
+            AND (cf.salary_withdrawal_standard_name = '' or cf.salary_withdrawal_standard_name IS NULL)
         </if>
         <if test="compileCategory!=null and compileCategory != ''">
             AND cf.compile_category = #{compileCategory}
         </if>
         <if test="compileCategory==null or compileCategory == ''">
-            AND cf.compile_category = ''
+            AND (cf.compile_category = '' or cf.compile_category  IS NULL)
         </if>
         <if test="classType!=null and classType != ''">
             AND cf.class_type = #{classType}
         </if>
         <if test="classType==null or classType == ''">
-            AND cf.class_type IS NULL
+            AND (cf.class_type IS NULL or cf.class_type = '')
         </if>
 	    ORDER BY ci.salary DESC LIMIT 1
     </select>
@@ -80,19 +80,19 @@
             AND cf.salary_withdrawal_standard_name = #{salaryWithdrawalStandardName}
         </if>
         <if test="salaryWithdrawalStandardName==null or salaryWithdrawalStandardName == ''">
-            AND cf.salary_withdrawal_standard_name = ''
+            AND (cf.salary_withdrawal_standard_name = '' or cf.salary_withdrawal_standard_name IS NULL)
         </if>
         <if test="compileCategory!=null and compileCategory != ''">
             AND cf.compile_category = #{compileCategory}
         </if>
         <if test="compileCategory==null or compileCategory == ''">
-            AND cf.compile_category = ''
+            AND (cf.compile_category = '' or cf.compile_category  IS NULL)
         </if>
         <if test="classType!=null and classType != ''">
             AND cf.class_type = #{classType}
         </if>
         <if test="classType==null or classType == ''">
-            AND cf.class_type IS NULL
+            AND (cf.class_type IS NULL or cf.class_type = '')
         </if>
         ORDER BY ci.salary DESC LIMIT 1
     </select>

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

@@ -163,12 +163,12 @@ public class SchoolConfigServiceImpl extends ServiceImpl<SchoolConfigMapper, Sch
 			if (StringUtils.isNotBlank(schoolConfig.getCompileCategory())){ //岗位
 				throw new SecurityException(schoolConfig.getNormType()+"中岗位不需要输入");
 			}
-			if (StringUtils.isNotBlank(schoolConfig.getInSection()) && schoolConfig.getInSection().equals("高中部") && StringUtils.isBlank(schoolConfig.getClassType())){ //授课类别
+			/*if (StringUtils.isNotBlank(schoolConfig.getInSection()) && schoolConfig.getInSection().equals("高中部") && StringUtils.isBlank(schoolConfig.getClassType())){ //授课类别
 				throw new SecurityException(schoolConfig.getNormType()+"中授课类别不能为空");
 			}
 			if (StringUtils.isNotBlank(schoolConfig.getInSection()) && !schoolConfig.getInSection().equals("高中部") && StringUtils.isNotBlank(schoolConfig.getClassType())){
 				throw new SecurityException(schoolConfig.getNormType()+"中授课类别不需要输入");
-			}
+			}*/
 		}
 		if (schoolConfig.getNormType().equals("班主任补贴标准")){
 			if (StringUtils.isBlank(schoolConfig.getInSection())){   //部门