diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java index fba020c5..36c8d0d6 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java @@ -280,7 +280,7 @@ public class ResourcesQuestionController { if (result.hasErrors()) { return JsonResult.failMessage(result); } else { - if (ObjectUtil.equals(resourcesQuestion.getSourceType(), 1)) { + if (ObjectUtil.equals(resourcesQuestion.getSourceType(), "1")) { if (ObjectUtil.isEmpty(resourcesQuestion.getResourcesQuestionId())) { return JsonResult.failMessage("更新失败"); } diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md index f7378be9..ba048e81 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseChatLog.md @@ -32,8 +32,14 @@ queryByCondition @if(!isEmpty(teacherOpenCourseIdPlural)){ and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) @} - @if(!isEmpty(schoolClassIds)){ - and find_in_set(t.school_class_ids, #schoolClassIds#) + @if(!isEmpty( )){ + and IF + ( t.school_class_idsZ not null, TRUE, + @for(var classId in strUtil.split(schoolClassIds, ',')) { + find_in_set(#classId#, t.school_class_ids) or + @} + @// 用来拼接最后的or + false ) @} @if(!isEmpty(teacherId)){ and t.teacher_id =#teacherId#