Merge remote-tracking branch 'origin/企微聊天' into 企微聊天

fs-admin/src/main/java/com/fs/course/controller/FsCoursePlaySourceConfigController.java

@@ -50,13 +50,15 @@ public class FsCoursePlaySourceConfigController extends BaseController {
                               @RequestParam(required = false) Integer isMall,
                               @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                               @RequestParam(required = false, defaultValue = "10") Integer pageSize,
-                              @RequestParam(required = false) Long companyId
+                              @RequestParam(required = false) Long companyId,
+                              @RequestParam(required = false) Long status
     ) {
         Map<String, Object> params = new HashMap<>();
         params.put("name", name);
         params.put("appid", appid);
         params.put("isMall", isMall);
         params.put("companyId", companyId);
+        params.put("status", status);
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);

fs-service/src/main/resources/mapper/course/FsCoursePlaySourceConfigMapper.xml

@@ -27,6 +27,9 @@
         <if test="params.isMall != null">
             and fcpsc.is_mall = #{params.isMall}
         </if>
+        <if test="params.status != null">
+            and fcpsc.status = #{params.status}
+        </if>
         order by fcpsc.id desc
     </select>