--no commit message

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/articlelibrary/FgArticleLibraryOneVO.java

 package com.zrqx.resource.commons.vo.fg.articlelibrary;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.List;
 
 import com.zrqx.resource.commons.model.articlelibrary.ArticleToAudio;
+import com.zrqx.resource.commons.model.resourcerelation.ResourceRelation;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 @Data
 @ApiModel(value="FgArticleLibraryOneVO",description="前台-单个查询文章返回的实体")
@@ -109,4 +109,7 @@ public class FgArticleLibraryOneVO {
 	
 	@ApiModelProperty("音频集合")
 	private List<ArticleToAudio> articleToAudioList;
+	
+	@ApiModelProperty("资源关联库")
+	private List<ResourceRelation> resourceRelationList;
 }

app/resource/src/main/java/com/zrqx/resource/fg/controller/articlelibrary/FgArticleLibraryController.java

@@ -31,6 +31,7 @@ import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.resource.bg.service.ResourceRelationService;
 import com.zrqx.resource.commons.form.fg.articlelibrary.FgDirectoryForm;
 import com.zrqx.resource.commons.form.fg.articlelibrary.FgQueryArticleLibraryForm;
 import com.zrqx.resource.commons.form.fg.articlelibrary.FgQueryRelatedArticleForm;
@@ -44,6 +45,7 @@ import com.zrqx.resource.commons.vo.fg.diytype.FgDiyTypeVo;
 import com.zrqx.resource.commons.vo.fg.label.FgLabelInfoVO;
 import com.zrqx.resource.commons.vo.fg.marketing.FgPromotionInfoOneVO;
 import com.zrqx.resource.commons.vo.fg.resource.FgAboutListVo;
+import com.zrqx.resource.fg.service.FgResourceRelationService;
 import com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryDiyTypeService;
 import com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryLabelContentDiyTypeService;
 import com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryService;
@@ -83,6 +85,8 @@ public class FgArticleLibraryController {
 	@Autowired
 	private FgEbookService ebookService;
 	@Autowired
+	private FgResourceRelationService fgresourceRelationService;
+	@Autowired
 	private Redis redis;
 	/** 促销*/
 	@Autowired
@@ -188,6 +192,9 @@ public class FgArticleLibraryController {
 			ChapterLibrary directorys = chapterLibraryService.selectOne(directory);
 			articleLibraryOneVO.setOrderNum(directorys.getOrderNum());
 			id = articleLibrary.getId();
+			Example example = fgresourceRelationService.createExample();
+			example.createCriteria().andEqualTo("objectId", id);
+			articleLibraryOneVO.setResourceRelationList(fgresourceRelationService.selectByExample(example)); 
 		//通过bookID和orderNum查询文章
 		}else{
 			Integer orderNum = form.getOrderNum();

app/resource/src/main/java/com/zrqx/resource/fg/service/FgResourceRelationService.java

@@ -2,11 +2,14 @@ package com.zrqx.resource.fg.service;
 
 import java.util.List;
 
+import com.zrqx.core.service.BaseService;
+import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.resource.commons.form.fg.resource.FgQueryRelatedForm;
+import com.zrqx.resource.commons.model.resourcerelation.ResourceRelation;
 import com.zrqx.resource.commons.vo.fg.resource.FgAboutListVo;
 
-public interface FgResourceRelationService {
+public interface FgResourceRelationService extends BaseService<ResourceRelation, Integer> {
 
 	/**
 	 * 获取相关资源列表