Merge remote-tracking branch 'origin/master'

src/main/java/cn/wisenergy/chnmuseum/party/mapper/LearningContentBoardMapper.java

@@ -39,6 +39,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
             + "and lcb.exhibition_board_id = eb.id "
             + "and eb.video_content_id = vc.id "
             + "and vc.id = a.ref_item_id "
+            + "and a.file_type = 'VIDEO' "
             + "and lc.applicable_scope = 'THIS_ORGAN' "
             + "and lc.organ_code = #{organCode} "
             + "UNION ALL "
@@ -59,6 +60,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
             + "and lcb.exhibition_board_id = eb.id "
             + "and eb.video_content_id = vc.id "
             + "and vc.id = a.ref_item_id "
+            + "and a.file_type = 'VIDEO' "
             + "and lc.applicable_scope = 'THIS_ORGAN_SUB'"
             + "and lc.organ_code like CONCAT(#{organCode},'%') "
             + "UNION ALL "
@@ -78,6 +80,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
             + "and lcb.exhibition_board_id = eb.id "
             + "and eb.video_content_id = vc.id "
             + "and vc.id = a.ref_item_id "
+            + "and a.file_type = 'VIDEO' "
             + "and lc.applicable_scope = 'ALL_PLAT'"
             + "UNION ALL "
             + "SELECT a.*, eb.id exhibition_board_id, eb.name exhibition_board_name, eb.cover exhibition_board_cover "

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java

@@ -381,8 +381,6 @@ public class LearningContentController extends BaseController {
         final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
         learningContent.setAuditHistoryList(auditList);
 
-
-
         return getResult(learningContent);
     }