Long 3 месяцев назад
Родитель
Сommit
9081753a15

+ 2 - 0
fs-admin/src/main/java/com/fs/course/controller/FsVideoResourceController.java

@@ -37,6 +37,7 @@ public class FsVideoResourceController extends BaseController {
     public TableDataInfo list(@RequestParam(required = false) String resourceName,
                               @RequestParam(required = false) String fileName,
                               @RequestParam(required = false) Integer typeId,
+                              @RequestParam(required = false) Integer typeSubId,
                               @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                               @RequestParam(required = false, defaultValue = "10") Integer pageSize)
     {
@@ -44,6 +45,7 @@ public class FsVideoResourceController extends BaseController {
         params.put("resourceName", resourceName);
         params.put("fileName", fileName);
         params.put("typeId", typeId);
+        params.put("typeSubId", typeSubId);
 
         PageHelper.startPage(pageNum, pageSize);
         List<FsVideoResourceVO> list = fsVideoResourceService.selectVideoResourceListByMap(params);

+ 5 - 0
fs-service-system/src/main/java/com/fs/course/domain/FsVideoResource.java

@@ -27,6 +27,11 @@ public class FsVideoResource {
      */
     private Long typeId;
 
+    /**
+     * 子分类ID
+     */
+    private Long typeSubId;
+
     /**
      * 文件名称
      */

+ 2 - 2
fs-service-system/src/main/java/com/fs/course/vo/FsVideoResourceVO.java

@@ -23,9 +23,9 @@ public class FsVideoResourceVO {
     private Long typeId;
 
     /**
-     * 分类名称
+     * 子分类ID
      */
-    private String typeName;
+    private Long typeSubId;
 
     /**
      * 文件名称

+ 4 - 3
fs-service-system/src/main/resources/mapper/course/FsVideoResourceMapper.xml

@@ -6,10 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectVideoResourceListByMap" resultType="com.fs.course.vo.FsVideoResourceVO">
         select
-            rr.*,
-            ucc.cate_name typeName
+            rr.*
         from fs_video_resource rr
-        left join fs_user_course_category ucc on ucc.cate_id = rr.type_id
         where rr.is_del = 0
         <if test="params.resourceName != null and params.resourceName != ''">
             and rr.resource_name like concat('%', #{params.resourceName}, '%')
@@ -20,6 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.typeId != null">
             and rr.type_id = #{params.typeId}
         </if>
+        <if test="params.typeSubId != null">
+            and rr.type_sub_id = #{params.typeSubId}
+        </if>
         order by rr.create_time desc
     </select>
 </mapper>