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

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java

@@ -137,7 +137,7 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
 
     // 关联的班级列表
     @FetchSql("select  \n" +
-            "@if(strUtil.equalsIgnoreCase(teacherOpenCourseQuestionSettingId, 'ALL')) { \n" +
+            "@if(strUtil.equalsIgnoreCase(teacherOpenCourseQuestionSettingId+'', 'ALL')) { \n" +
             "'所有班级' \n" +
             "@} else { \n" +
             "group_concat(t.class_name) \n" +
@@ -145,7 +145,7 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
             "from school_class t where find_in_set(t.class_id, #teacherOpenCourseQuestionSettingSchoolClassIds#) \n" +
             "and t.class_status = 1 \n" +
             // 像章节练习这块，是不关联班级的，可以理解只要是学生身份，且加入这个课程，就可以做题。这个时候，给默认的占位符 'ALL' 或者 'all'
-            "@if(strUtil.equalsIgnoreCase(teacherOpenCourseQuestionSettingId, 'ALL')) { \n" +
+            "@if(strUtil.equalsIgnoreCase(teacherOpenCourseQuestionSettingId+'', 'ALL')) { \n" +
             "and 1 != 1 \n" +
             "@} \n")
     private String teacherOpenCourseQuestionSettingSchoolClassNames;