课表拉去增加null值判断

src/main/java/com/template/mapper/TbCourseSchedulingMapper.java

@@ -28,17 +28,17 @@ public interface TbCourseSchedulingMapper extends BaseMapper<TbCourseScheduling>
             "a.dt `dateTime`,'自动导入' remark,now() createTime,now() updateTime,'0' createUser,'0' updateUser, 0 deleted  from \n" +
             "(select \n" +
             "date_add((select cfg_value from tb_config tc where cfg_key='termBeginsTime' ),interval (push_djz -1)*7+push_zj-1 day)  `dt`,a.*\n" +
-            "from tb_course_scheduling a where  push_xq =#{xueqi} AND push_xn = #{xuenian} and OPERATION_TYPE !='deleted' ) a,\n" +
+            "from tb_course_scheduling a where  push_xq =#{xueqi} AND push_xn = #{xuenian} and IFNULL(OPERATION_TYPE,'') !='deleted' ) a,\n" +
             "(select \n" +
             "date_add((select cfg_value from tb_config tc where cfg_key='termBeginsTime' ),interval (push_djz -1)*7+push_zj-1 day)  `dt`,a.*\n" +
-            "from tb_course_scheduling a where  push_xq =#{xueqi} AND push_xn = #{xuenian} and OPERATION_TYPE !='deleted' ) b\n" +
+            "from tb_course_scheduling a where  push_xq =#{xueqi} AND push_xn = #{xuenian} and IFNULL(OPERATION_TYPE,'') !='deleted' ) b\n" +
             "where  TIMESTAMPDIFF(DAY,a.dt,b.dt)=1 and a.push_jsgh=b.push_jsgh\n" +
             "union all\n" +
             "select \n" +
             "push_jc jc,push_zj zj,push_djz djz,push_xq xq,push_xn xn,push_jsxm jsxm,push_jsgh jsgh,\n" +
             "date_add((select cfg_value from tb_config tc where cfg_key='termBeginsTime' ),interval (push_djz -1)*7+push_zj-1 day)  `dateTime`,\n" +
             "'自动导入' remark,now() createTime,now() updateTime,'0' createUser,'0' updateUser,0 deleted\n" +
-            "from  tb_course_scheduling where push_xq =#{xueqi} AND push_xn = #{xuenian} and OPERATION_TYPE !='deleted' and SUBSTRING_INDEX(push_jc,\"-\", -1)>=8 \n" +
+            "from  tb_course_scheduling where push_xq =#{xueqi} AND push_xn = #{xuenian} and IFNULL(OPERATION_TYPE,'') !='deleted' and SUBSTRING_INDEX(push_jc,\"-\", -1)>=8 \n" +
             ") c group by jsgh,dateTime")
     @DS("readOnly")
     List<Map<String,Object>> listAll(String xuenian, String xueqi);