Commit 998dbb38 authored by wzp's avatar wzp

修改appbug

parent 7d01fdaf
...@@ -50,7 +50,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -50,7 +50,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+ "and lcb.exhibition_board_id = eb.id " + "and lcb.exhibition_board_id = eb.id "
+ "and eb.video_content_id = vc.id " + "and eb.video_content_id = vc.id "
+ "and vc.id = a.ref_item_id " + "and vc.id = a.ref_item_id "
+ "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 " + "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 and lc.is_deleted = 0 "
+ "and a.is_published = 1 " + "and a.is_published = 1 "
+ "and a.file_type = 'VIDEO' " + "and a.file_type = 'VIDEO' "
+ "and lc.applicable_scope = 'THIS_ORGAN' " + "and lc.applicable_scope = 'THIS_ORGAN' "
...@@ -60,7 +60,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -60,7 +60,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+ "WHERE lcb.learning_content_id = lc.id " + "WHERE lcb.learning_content_id = lc.id "
+ "and lcb.exhibition_board_id = eb.id " + "and lcb.exhibition_board_id = eb.id "
+ "and eb.id = a.ref_item_id " + "and eb.id = a.ref_item_id "
+ "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 " + "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and lc.is_deleted = 0 "
+ "and a.is_published = 1 " + "and a.is_published = 1 "
+ "and a.file_cat = 'EXHIBITION_BOARD_DATUM' " + "and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+ "and a.file_type = 'VIDEO' " + "and a.file_type = 'VIDEO' "
...@@ -75,7 +75,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -75,7 +75,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+ "and lcb.exhibition_board_id = eb.id " + "and lcb.exhibition_board_id = eb.id "
+ "and eb.video_content_id = vc.id " + "and eb.video_content_id = vc.id "
+ "and vc.id = a.ref_item_id " + "and vc.id = a.ref_item_id "
+ "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 " + "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 and lc.is_deleted = 0 "
+ "and a.is_published = 1 " + "and a.is_published = 1 "
+ "and a.file_type = 'VIDEO' " + "and a.file_type = 'VIDEO' "
+ "and lc.applicable_scope = 'THIS_ORGAN_SUB'" + "and lc.applicable_scope = 'THIS_ORGAN_SUB'"
...@@ -85,7 +85,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -85,7 +85,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+ "WHERE lcb.learning_content_id = lc.id " + "WHERE lcb.learning_content_id = lc.id "
+ "and lcb.exhibition_board_id = eb.id " + "and lcb.exhibition_board_id = eb.id "
+ "and eb.id = a.ref_item_id " + "and eb.id = a.ref_item_id "
+ "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 " + "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and lc.is_deleted = 0 "
+ "and a.is_published = 1 " + "and a.is_published = 1 "
+ "and a.file_cat = 'EXHIBITION_BOARD_DATUM' " + "and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+ "and a.file_type = 'VIDEO' " + "and a.file_type = 'VIDEO' "
...@@ -99,7 +99,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -99,7 +99,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+ "and lcb.exhibition_board_id = eb.id " + "and lcb.exhibition_board_id = eb.id "
+ "and eb.video_content_id = vc.id " + "and eb.video_content_id = vc.id "
+ "and vc.id = a.ref_item_id " + "and vc.id = a.ref_item_id "
+ "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 " + "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and vc.is_deleted = 0 and lc.is_deleted = 0 "
+ "and a.is_published = 1 " + "and a.is_published = 1 "
+ "and a.file_type = 'VIDEO' " + "and a.file_type = 'VIDEO' "
+ "and lc.applicable_scope = 'ALL_PLAT'" + "and lc.applicable_scope = 'ALL_PLAT'"
...@@ -109,7 +109,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -109,7 +109,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+ "WHERE lcb.learning_content_id = lc.id " + "WHERE lcb.learning_content_id = lc.id "
+ "and lcb.exhibition_board_id = eb.id " + "and lcb.exhibition_board_id = eb.id "
+ "and eb.id = a.ref_item_id " + "and eb.id = a.ref_item_id "
+ "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 " + "and lc.is_published = 1 and eb.is_published = 1 and eb.is_deleted = 0 and lc.is_deleted = 0 "
+ "and a.is_published = 1 " + "and a.is_published = 1 "
+ "and a.file_cat = 'EXHIBITION_BOARD_DATUM' " + "and a.file_cat = 'EXHIBITION_BOARD_DATUM' "
+ "and a.file_type = 'VIDEO' " + "and a.file_type = 'VIDEO' "
......
...@@ -451,7 +451,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -451,7 +451,7 @@ public class ChinaMobileRestApiController extends BaseController {
} }
exhibitionBoard.setDatumList(datumList); exhibitionBoard.setDatumList(datumList);
videoList.addAll(datumList.stream().filter(x -> FileTypeEnum.VIDEO.name().equalsIgnoreCase(x.getFileType())).collect(Collectors.toList())); // videoList.addAll(datumList.stream().filter(x -> FileTypeEnum.VIDEO.name().equalsIgnoreCase(x.getFileType())).collect(Collectors.toList()));
exhibitionBoard.setVideoList(videoList); exhibitionBoard.setVideoList(videoList);
} }
return getResult(page); return getResult(page);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment