Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md

@@ -32,9 +32,9 @@ queryByCondition
   @if(!isEmpty(teacherOpenCourseIdPlural)){
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
-  @if(!isEmpty( )){
+  @if(!isEmpty(schoolClassIds)){
   and IF
-  ( t.school_class_idsZ not null, TRUE,
+  ((t.school_class_ids is null or t.school_class_ids = ''), TRUE,
   @for(var classId in strUtil.split(schoolClassIds, ',')) {
   find_in_set(#classId#, t.school_class_ids) or
   @}