Преглед изворни кода

Merge branch 'feature/v1.1.50_ws' of BaseService/jyMicroservices into feature/v1.1.50

wangshan пре 1 година
родитељ
комит
0ecea01fdb
1 измењених фајлова са 2 додато и 1 уклоњено
  1. 2 1
      jyBXBase/rpc/internal/logic/showsearchlogic.go

+ 2 - 1
jyBXBase/rpc/internal/logic/showsearchlogic.go

@@ -44,7 +44,7 @@ func (l *ShowSearchLogic) ShowSearch(in *bxbase.ShowSearchReq) (res *bxbase.Show
 	}
 	query := map[string]interface{}{
 		"user_id": in.UserId,
-		"type":    in.Type,
+		//"type":    in.Type,
 	}
 	allSearch, b := IC.Mgo.Find("search_condition", query, `{"creation_time":-1}`, "", false, -1, -1)
 	if !b {
@@ -102,6 +102,7 @@ func (l *ShowSearchLogic) ShowSearch(in *bxbase.ShowSearchReq) (res *bxbase.Show
 			listSearch.WordsMode = common.Int64All(vlu["wordsMode"])
 			listSearch.AdditionalWords = common.InterfaceToStr(vlu["additionalWords"])
 			listSearch.InKey = common.InterfaceToStr(vlu["in_key"])
+			listSearch.Type = common.InterfaceToStr(vlu["type"])
 			regionMap := gconv.Map(vlu["regionMap"])
 			region := map[string]*bxbase.Area{}
 			if regionMap != nil {