--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/controller/membercollection/FgMemberCollectionController.java

@@ -91,7 +91,8 @@ public class FgMemberCollectionController {
 	@GetMapping(value = "/page")
 	public CallBack<PageInfo<FgMemberCollectionVo>> queryPage(MemberCollectionForm form,PageParam pageParam){
 		PageInfo<FgMemberCollectionVo> voPage = service.queryPage(form,pageParam);
-		voPage.getList().forEach(li -> {
+		for (int i = voPage.getList().size() - 1; i >= 0; i--) {
+			FgMemberCollectionVo li = voPage.getList().get(i);
 			if(AllResourceTypeEnum.VIDEO.getCode().toString().equals(li.getObjectType().toString())){
 				FgVideoLibraryVO ar = videoLibraryService.selectById(li.getObjectId(),true);
 				if(ar != null){
@@ -105,7 +106,10 @@ public class FgMemberCollectionController {
 					li.setCover(ar.getCover());
 					li.setIntro(ar.getSynopsis());
 					li.setFromTitle(ar.getSource());
-					li.setStatus(ar.getStatus());
+					//判断该资源的上下架状态，若下架则不展示
+					if(2 == ar.getStatus().intValue()) {
+						voPage.getList().remove(i);
+					}
 				}else{
 					li.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_2.getCode());
 					li.setMessage("该资源不存在");
@@ -125,14 +129,18 @@ public class FgMemberCollectionController {
 					li.setIntro(ar.getSynopsis());
 					Integer count = resourceRelationService.queryCourseCountByVideoId(ar.getId());
 					li.setResourceNumber(count);
-					li.setStatus(ar.getStatus());
+					//判断该资源的上下架状态，若下架则不展示
+					if(2 == ar.getStatus().intValue()) {
+						voPage.getList().remove(i);
+					}
 				}else{
 					li.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_2.getCode());
 					li.setMessage("该资源不存在");
 					li.setMessageCode(5);
 				}
 			}
-		});
+		}
+		
 		/*
 		 * if(AllResourceTypeEnum.VIDEO.getCode().toString().equals(form.getGoodsType())
 		 * ){ voPage.getList().forEach(li -> { if(StringUtils.isNotBlank(li.getName())){