--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/mapper/membercollection/FgMemberCollectionMapper.java

@@ -95,4 +95,18 @@ public interface FgMemberCollectionMapper extends BaseMapper<MemberCollection> {
 			+ " order by createTime desc "
 			+"</script>")
 	List<FgMemberCollectionVo> queryCoursePage(@Param("form")MemberCollectionForm form);
+
+	/**
+	 * 
+	 * @param form
+	 * @return
+	 */
+	@Select("<script>"
+			+ " select a.id, a.objectId, a.objectType "
+			+ " from res_member_collection a "
+			+ " where 1=1 "
+			+ DEFAULT_PARAM
+			+ " order by createTime desc "
+			+"</script>")
+	List<FgMemberCollectionVo> queryResourcePage(@Param("form")MemberCollectionForm form);
 }

app/resource/src/main/java/com/zrqx/resource/fg/service/membercollection/FgMemberCollectionServiceImpl.java

@@ -13,7 +13,6 @@ import org.springframework.stereotype.Service;
 import com.zrqx.core.client.form.order.GoodsForm;
 import com.zrqx.core.commons.form.LoginMemberInfo;
 import com.zrqx.core.commons.redis.Redis;
-import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageInfo;
@@ -122,33 +121,8 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
 		String memberId = member.getId().toString();
 		form.setMemberId(memberId);
 		List<FgMemberCollectionVo> list = null;	
-		String type = form.getGoodsType();
-		if(AllResourceTypeEnum.BOOK.getCode().toString().equals(type)){
 		startPage(pageParam);
-			list = mapper.queryBookPage(form);
-		}else if(AllResourceTypeEnum.ARTICLE.getCode().toString().equals(type)){
-			startPage(pageParam);
-			list = mapper.queryArticlePage(form);
-		}else if(AllResourceTypeEnum.AUTHOR.getCode().toString().equals(type)){
-			startPage(pageParam);
-			list = mapper.queryAuthorPage(form);
-		}else if(AllResourceTypeEnum.IMAGE.getCode().toString().equals(type)){
-			startPage(pageParam);
-			list = mapper.queryImagePage(form);
-		}else if(AllResourceTypeEnum.VIDEO.getCode().toString().equals(type)){
-			startPage(pageParam);
-			list = mapper.queryVideoPage(form);
-		}else if(AllResourceTypeEnum.AUDIO.getCode().toString().equals(type)){
-			startPage(pageParam);
-			list = mapper.queryAudioPage(form);
-		}else if(AllResourceTypeEnum.ANNEX.getCode().toString().equals(type)){
-			startPage(pageParam);
-			list = mapper.queryAnnexPage(form);
-		}else if(AllResourceTypeEnum.COURSE.getCode().toString().equals(type)){
-			startPage(pageParam);
-			list = mapper.queryCoursePage(form);
-		}
-		
+		list = mapper.queryResourcePage(form);
 		if(list != null){
 			for(int i=0;i<list.size();i++){
 				FgMemberCollectionVo vo = list.get(i);