--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/service/ResourceRelationServiceImpl.java

 package com.zrqx.resource.bg.service;
 
+import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
-import com.zrqx.core.enums.AllResourceTypeEnum;
+import com.zrqx.core.enums.resource.ResourceTypeEnum;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.resource.bg.mapper.ResourceRelationMapper;
+import com.zrqx.resource.bg.mapper.articlelibrary.ArticleLibraryMapper;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryMapper;
 import com.zrqx.resource.commons.form.bg.QueryResourceRelationForm;
+import com.zrqx.resource.commons.model.articlelibrary.ArticleLibrary;
 import com.zrqx.resource.commons.model.resourcerelation.ResourceRelation;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
 import com.zrqx.resource.commons.vo.bg.ResourceRelationVo;
@@ -26,6 +28,9 @@ public class ResourceRelationServiceImpl extends BaseServiceImpl<ResourceRelatio
 	@Autowired
 	private VideoLibraryMapper videoLibraryMapper;
 	
+	@Autowired
+	private ArticleLibraryMapper articleLibraryMapper;
+	
 	@Override
 	public BaseMapper<ResourceRelation> getMapper() {
 		return mapper;
@@ -34,11 +39,18 @@ public class ResourceRelationServiceImpl extends BaseServiceImpl<ResourceRelatio
 	public List<ResourceRelationVo> queryRelationList(List<ResourceRelationVo> list) {
 		list.forEach(e -> {
 			if (e.getResourceType() != null) {
-				if (e.getResourceType().equals(AllResourceTypeEnum.VIDEO.getCode())) {
+				if (e.getResourceType().equals(ResourceTypeEnum.VIDEO_LIBRARY.getCode())) {
 					VideoLibrary vl = videoLibraryMapper.selectByPrimaryKey(e.getResourceId());
 					if (vl != null) {
 						e.setName(vl.getName());
-						e.setResType_zh(AllResourceTypeEnum.VIDEO.getName());
+						e.setResType_zh(ResourceTypeEnum.VIDEO_LIBRARY.getName());
+					}
+				}
+				if (e.getResourceType().equals(ResourceTypeEnum.ARTICLE_LIBRARY.getCode())) {
+					ArticleLibrary vl = articleLibraryMapper.selectByPrimaryKey(e.getResourceId());
+					if (vl != null) {
+						e.setName(vl.getName());
+						e.setResType_zh(ResourceTypeEnum.ARTICLE_LIBRARY.getName());
 					}
 				}
 			}
@@ -51,11 +63,15 @@ public class ResourceRelationServiceImpl extends BaseServiceImpl<ResourceRelatio
 	 */
 	@Override
 	public List<ResourceRelationVo> queryByIdAndResourceType(QueryResourceRelationForm entity, PageParam pageParam) {
-		if(null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy("sort asc");
-		}
+		List<ResourceRelationVo> list = new ArrayList<ResourceRelationVo>();
+		if(ResourceTypeEnum.ARTICLE_LIBRARY.getCode().equals(entity.getResourceType())) {
+			PageHelper.startPage(pageParam);
+			list = mapper.queryArticleByIdAndResourceType(entity);
+		}else if(ResourceTypeEnum.VIDEO_LIBRARY.getCode().equals(entity.getResourceType())) {
 			PageHelper.startPage(pageParam);
-		return mapper.queryByIdAndResourceType(entity);
+			list = mapper.queryVideoByIdAndResourceType(entity);
+		}
+		return list;
 	}
 
 	@Override