Merge branch 'bzq/knowledge_add_viewpoint' of eta_gn_server/eta_api into debug

controllers/knowledge/resource.go

@@ -415,6 +415,7 @@ func (this *ResourceController) Search() {
 		classifyIdsInt,
 		sourceFromArr,
 		tagIdsInt,
+		isShowMe,
 		isIncludeFile,
 		isQueryRef,
 		startSize,

services/knowledge/es.go

@@ -52,7 +52,7 @@ func EsBatchAddOrEditKnowledgeResource(list []*knowledge.KnowledgeResource) (err
 }
 
 // SearchChartInfoData 查询es中的图表数据
-func SearchKnowledgeResourceByEs(resourceType int, keywordStr string, showSysIds []int, myId int, classifyIds []int, sourceList []string, tagIds []int, isIncludeFile, isQueryRef bool, from, size int) (list []*knowledge.KnowledgeResource, total int64, err error) {
+func SearchKnowledgeResourceByEs(resourceType int, keywordStr string, showSysIds []int, myId int, classifyIds []int, sourceList []string, tagIds []int, isShowMe, isIncludeFile, isQueryRef bool, from, size int) (list []*knowledge.KnowledgeResource, total int64, err error) {
 	indexName := utils.EsKnowledgeResourceIndexName
 	list = make([]*knowledge.KnowledgeResource, 0)
 	defer func() {
@@ -79,7 +79,7 @@ func SearchKnowledgeResourceByEs(resourceType int, keywordStr string, showSysIds
 			},
 		})
 	}
-	if myId > 0 {
+	if myId > 0 && isShowMe {
 		mustMap = append(mustMap, map[string]interface{}{
 			"term": map[string]interface{}{
 				"AdminId": myId,