|
|
@@ -33,7 +33,7 @@ func FindDocumentById(id int) {
|
|
|
log.Println(jyDocsRpcUtil.GetJyDocsDB().Exec("select * from ").Error)
|
|
|
}
|
|
|
|
|
|
-func DocQuery(in *stdlib.DocQueryRequest) *stdlib.DocQueryResponse {
|
|
|
+func DocQuery(in *stdlib.DocQueryRequest, searchSource []string) *stdlib.DocQueryResponse {
|
|
|
defer common.Catch()
|
|
|
in.KeyWord = strings.TrimSpace(in.KeyWord)
|
|
|
musts := []string{}
|
|
|
@@ -69,6 +69,9 @@ func DocQuery(in *stdlib.DocQueryRequest) *stdlib.DocQueryResponse {
|
|
|
query_sort = fmt.Sprintf(Es_Query_Sort, strings.Join(sorts, ","))
|
|
|
}
|
|
|
query_append := fmt.Sprintf(Es_Query_Append, (in.PageNum-1)*in.PageSize, in.PageSize)
|
|
|
+ if searchSource != nil && len(searchSource) > 0 {
|
|
|
+ musts = append(musts, fmt.Sprintf(Terms, "source", strings.Join(searchSource, `","`)))
|
|
|
+ }
|
|
|
if len(musts) == 0 {
|
|
|
query = fmt.Sprintf(Es_Query_All, fmt.Sprint(query_append, query_sort))
|
|
|
} else if in.KeyWord != "" {
|
