diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java index 55192b12..77b71801 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java @@ -346,11 +346,18 @@ public class CourseInfoController { condition.setCourseInfoType(1);//类型(1课程 2章 3节) PageQuery page = condition.getPageQuery(); page.setOrderBy("add_time desc"); - if (coreUser.isAdmin()){ - courseInfoService.getCourseDispositionSystemOAndUniversities(page); - }else { - courseInfoService.queryByCondition(page); - } + courseInfoService.queryByCondition(page); + return JsonResult.success(page); + } + + @PostMapping(MODEL + "/courseDispositionSystemOAndUniversitiesList.json") + @Function("courseInfo.query") + @ResponseBody + public JsonResult courseDispositionSystemOAndUniversities(CourseInfoQuery condition,@SCoreUser CoreUser coreUser) { + condition.setCourseInfoType(1);//类型(1课程 2章 3节) + PageQuery page = condition.getPageQuery(); + page.setOrderBy("add_time desc"); + courseInfoService.getCourseDispositionSystemOAndUniversities(page); return JsonResult.success(page); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/CourseInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/CourseInfoQuery.java index 0f085bf6..025f4a76 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/CourseInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/CourseInfoQuery.java @@ -83,6 +83,11 @@ public class CourseInfoQuery extends PageParam { private Integer sourceType;//来源类型 1.开课 2.授权课 + /** + * 课程来源搜索 + */ + private String userName; + public String getOrgIdPlural() { return orgIdPlural; } @@ -363,4 +368,12 @@ public class CourseInfoQuery extends PageParam { public void setSourceType(Integer sourceType) { this.sourceType = sourceType; } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } } diff --git a/web/src/main/resources/sql/jlw/courseInfo.md b/web/src/main/resources/sql/jlw/courseInfo.md index 06658b4d..98eda77e 100644 --- a/web/src/main/resources/sql/jlw/courseInfo.md +++ b/web/src/main/resources/sql/jlw/courseInfo.md @@ -992,4 +992,7 @@ and tt.source_type = #sourceType# @} @if(!isEmpty(courseLabelId)){ and tt.course_label_id = #courseLabelId# +@} +@if(!isEmpty(userName)){ +and tt.user_name like #'%'+userName+'%'# @} \ No newline at end of file