1、课程配置更换接口

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<PageQuery> 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);
     }
 

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;
+    }
 }

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+'%'#
 @}