diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java
index b3317c1b..936a050f 100644
--- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java
@@ -1,6 +1,7 @@
 package com.zyplayer.doc.data.service.elasticsearch.support;
 
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dozer.Mapper;
 import org.elasticsearch.action.DocWriteResponse;
@@ -105,6 +106,26 @@ public abstract class EsAbstractService<T> {
 	public EsPage<T> getDataByCondition(List<EsQueryColumn> condition, String[] fields, Integer startIndex, Integer pageSize) {
 		BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
 		// 组装条件
+		for (EsQueryColumn column : condition) {
+			if (StringUtils.isBlank(column.getValue())) {
+				if (CollectionUtils.isEmpty(column.getValues())) {
+					continue;
+				}
+				for (Object value : column.getValues()) {
+					if (column.getType() == 0) {
+						boolQueryBuilder.must(QueryBuilders.wildcardQuery(column.getKey(), value.toString()));
+					} else if (column.getType() == 1) {
+						boolQueryBuilder.must(QueryBuilders.termQuery(column.getKey(), value));
+					}
+				}
+			} else {
+				if (column.getType() == 0) {
+					boolQueryBuilder.must(QueryBuilders.wildcardQuery(column.getKey(), column.getValue()));
+				} else if (column.getType() == 1) {
+					boolQueryBuilder.must(QueryBuilders.termQuery(column.getKey(), column.getValue()));
+				}
+			}
+		}
 		condition.forEach(val -> {
 			if (StringUtils.isNotBlank(val.getValue())) {
 				if (val.getType() == 0) {
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsQueryColumn.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsQueryColumn.java
index b9b8c141..6fe913fb 100644
--- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsQueryColumn.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsQueryColumn.java
@@ -1,5 +1,7 @@
 package com.zyplayer.doc.data.service.elasticsearch.support;
 
+import java.util.List;
+
 /**
  * es查询字段封装
  * @author 暮光：城中城
@@ -8,6 +10,7 @@ package com.zyplayer.doc.data.service.elasticsearch.support;
 public class EsQueryColumn {
 	private String key;
 	private String value;
+	private List<Object> values;
 	// 类型，0=分词搜索 1=不分词
 	private int type;
 	
@@ -21,6 +24,12 @@ public class EsQueryColumn {
 		this.type = type;
 	}
 	
+	public EsQueryColumn(String key, List<Object> values, int type) {
+		this.key = key;
+		this.values = values;
+		this.type = type;
+	}
+	
 	public static EsQueryColumn like(String key, String value){
 		return new EsQueryColumn(key, value, 0);
 	}
@@ -29,6 +38,10 @@ public class EsQueryColumn {
 		return new EsQueryColumn(key, value, 1);
 	}
 	
+	public static EsQueryColumn in(String key, List<Object> values){
+		return new EsQueryColumn(key, values, 1);
+	}
+	
 	public String getKey() {
 		return key;
 	}
@@ -52,4 +65,12 @@ public class EsQueryColumn {
 	public void setType(int type) {
 		this.type = type;
 	}
+	
+	public List<Object> getValues() {
+		return values;
+	}
+	
+	public void setValues(List<Object> values) {
+		this.values = values;
+	}
 }
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
index 460d1fc4..a1ac92f4 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
@@ -1,5 +1,6 @@
 package com.zyplayer.doc.wiki.controller;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageHelper;
@@ -30,6 +31,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.dozer.Mapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -65,7 +67,7 @@ public class WikiPageController {
 	WikiPageMapper wikiPageMapper;
 	@Resource
 	Mapper mapper;
-	@Resource
+	@Autowired(required = false)
 	EsWikiPageService esWikiPageService;
 	
 	@PostMapping("/list")
@@ -266,7 +268,8 @@ public class WikiPageController {
 		}
 		// 保存到es
 		if (esWikiPageService != null) {
-			EsWikiPage esWikiPage = mapper.map(wikiPage, EsWikiPage.class);
+			WikiPage wikiPageSel = wikiPageService.getById(wikiPage.getId());
+			EsWikiPage esWikiPage = mapper.map(wikiPageSel, EsWikiPage.class);
 			esWikiPage.setContent(content);
 			esWikiPage.setPreview(preview);
 			esWikiPageService.create(esWikiPage);
@@ -306,39 +309,45 @@ public class WikiPageController {
 	@GetMapping("/searchByEs")
 	public ResponseJson<Object> searchByEs(SearchByEsParam param) {
 		// 空间不是自己的
-		WikiSpace wikiSpaceSel = this.getCanVisitWikiSpace(param.getSpaceId());
-		if (wikiSpaceSel == null) {
+		Map<Long, WikiSpace> wikiSpaceSel = this.getCanVisitWikiSpace(param.getSpaceId());
+		if (wikiSpaceSel.isEmpty()) {
 			return DocResponseJson.ok();
 		}
-		PageInfo<EsWikiPage> pageInfo = new PageInfo<>();
 		if (esWikiPageService != null) {
 			List<EsQueryColumn> condition = new LinkedList<>();
 			condition.add(EsQueryColumn.like("name", param.getKeywords()));
 			condition.add(EsQueryColumn.like("content", param.getKeywords()));
-//			condition.add(EsQueryColumn.must("delFlag", "0"));
+			condition.add(EsQueryColumn.must("delFlag", "0"));
+			condition.add(EsQueryColumn.in("spaceId", new ArrayList<>(wikiSpaceSel.keySet())));
 			String[] fields = {
 					"id", "preview", "createTime", "updateTime", "createUserId", "createUserName",
 					"updateUserId", "updateUserName", "spaceId", "name", "zanNum", "viewNum",
 			};
 			EsPage<EsWikiPage> wikiPageEsPage = esWikiPageService.getDataByCondition(condition, fields, param.getStartIndex(), param.getPageSize());
+			// 组装数据返回
+			PageInfo<EsWikiPage> pageInfo = new PageInfo<>();
 			pageInfo.setTotal(wikiPageEsPage.getTotal());
 			pageInfo.setList(wikiPageEsPage.getData());
+			return DocResponseJson.ok(pageInfo);
 		} else {
 			logger.warn("未开启elasticsearch服务，使用数据库查询匹配，建议开启");
-			
+			SpaceNewsParam newsParam = new SpaceNewsParam();
+			newsParam.setPageNum(param.getPageNum());
+			newsParam.setPageSize(param.getPageSize());
+			newsParam.setSpaceId(param.getSpaceId());
+			return this.news(newsParam);
 		}
-		return DocResponseJson.ok(pageInfo);
 	}
 	
 	@PostMapping("/news")
 	public ResponseJson<Object> news(SpaceNewsParam param) {
 		// 空间不是自己的
-		WikiSpace wikiSpaceSel = this.getCanVisitWikiSpace(param.getSpaceId());
-		if (wikiSpaceSel == null) {
+		Map<Long, WikiSpace> wikiSpaceMap = this.getCanVisitWikiSpace(param.getSpaceId());
+		if (wikiSpaceMap.isEmpty()) {
 			return DocResponseJson.ok();
 		}
 		QueryWrapper<WikiPage> wrapper = new QueryWrapper<>();
-		wrapper.eq("space_id", param.getSpaceId());
+		wrapper.in("space_id", wikiSpaceMap.keySet());
 		wrapper.eq("del_flag", 0);
 		wrapper.orderByDesc(param.getNewsType() == 1, "update_time");
 		wrapper.orderByDesc(param.getNewsType() == 2, "create_time");
@@ -364,7 +373,7 @@ public class WikiPageController {
 		List<SpaceNewsVo> pageVoList = new LinkedList<>();
 		pageList.forEach(val -> {
 			SpaceNewsVo spaceNewsVo = mapper.map(val, SpaceNewsVo.class);
-			spaceNewsVo.setSpaceName(wikiSpaceSel.getName());
+			spaceNewsVo.setSpaceName(wikiSpaceMap.get(val.getSpaceId()).getName());
 			spaceNewsVo.setPreviewContent(contentMap.get(val.getId()));
 			spaceNewsVo.setPageTitle(val.getName());
 			spaceNewsVo.setPageId(val.getId());
@@ -375,17 +384,23 @@ public class WikiPageController {
 		return responseJson;
 	}
 	
-	private WikiSpace getCanVisitWikiSpace(Long spaceId){
+	private Map<Long, WikiSpace> getCanVisitWikiSpace(Long spaceId) {
 		DocUserDetails currentUser = DocUserUtil.getCurrentUser();
+		List<WikiSpace> spaceList;
 		// 空间不是自己的
 		if (spaceId == null || spaceId <= 0) {
-			return null;
+			QueryWrapper<WikiSpace> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("del_flag", 0);
+			queryWrapper.ne("type", SpaceType.privateSpace);
+			spaceList = wikiSpaceService.list(queryWrapper);
+		} else {
+			WikiSpace wikiSpaceSel = wikiSpaceService.getById(spaceId);
+			if (SpaceType.isOthersPrivate(wikiSpaceSel.getType(), currentUser.getUserId(), wikiSpaceSel.getCreateUserId())) {
+				return Collections.emptyMap();
+			}
+			spaceList = Collections.singletonList(wikiSpaceSel);
 		}
-		WikiSpace wikiSpaceSel = wikiSpaceService.getById(spaceId);
-		if (SpaceType.isOthersPrivate(wikiSpaceSel.getType(), currentUser.getUserId(), wikiSpaceSel.getCreateUserId())) {
-			return null;
-		}
-		return wikiSpaceSel;
+		return spaceList.stream().collect(Collectors.toMap(WikiSpace::getId, val -> val));
 	}
 	
 	private void setChildren(Map<Long, List<WikiPageVo>> listMap, List<WikiPageVo> nodePageList, String path) {