--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java

@@ -1018,6 +1018,11 @@ public class FgResourceLibraryController {
 					fqSq.append(" && resourceType : "+form.getResourceType());
 				}
 			}
+			//act  其它资源和文章分开  1：除文章的所有资源 2:只有文章
+			if(form.getAct() !=null ){
+				//判断搜索过滤
+				fqSq.append(" && act : "+form.getName());
+			}
 			//标题
 			if(StringUtils.isNoneBlank(form.getName())){
 				//判断搜索标题内容,过滤
@@ -1495,7 +1500,7 @@ public class FgResourceLibraryController {
 				resultMap.put("ordernum", solrDocument.get("ordernum"));
 				resultMap.put("ebookOrderNum", solrDocument.get("ebookOrderNum"));
 				resultMap.put("resourceType", solrDocument.get("resourceType"));
-				//resultMap.put("liveTime",formatLiveDate((Date)solrDocument.get("liveTime")));
+				resultMap.put("cover",solrDocument.get("cover"));
 				//resultMap.put("browseNum",solrDocument.get("browseNum"));
 				//resultMap.put("resourceType",solrDocument.get("resourceType"));