Merge branch 'dev_v1.1.30_wh' of BaseService/jyMicroservices into feature/v1.1.30

jyBXCore/rpc/entity/search.go

@@ -279,6 +279,7 @@ func (kws *KeyWordsSearch) GetBidSearchList(in *bxcore.SearchReq) (count, total
 // 聚合搜索
 func (kws *KeyWordsSearch) PolymerizeSearch(in *bxcore.PolymerizeSearchReq) *bxcore.SearchReturn {
 	data := &bxcore.SearchReturn{}
+
 	//powerCheck := IC.Middleground.PowerCheckCenter.Check(in.AppId, in.UserId, in.NewUserId, in.AccountId, in.EntId, in.PositionType, in.PositionId)
 	//企业搜索
 	now1 := time.Now().Unix()
@@ -293,16 +294,16 @@ func (kws *KeyWordsSearch) PolymerizeSearch(in *bxcore.PolymerizeSearchReq) *bxc
 	now3 := time.Now().Unix()
 	log.Println("企业查询耗时", now2-now1)
 	log.Println("采购单位搜搜索", now3-now2)
-	if in.AccountId > 0 {
+	/*if in.AccountId > 0 {
 		//菜单搜索
 		data.MenuList = service.MenuSearch(in)
 		//标讯搜索
-		/*	now4 := time.Now().Unix()
-			subscribeList := &bxcore.SearchMap{}
-			subscribeList.Data = service.SubscribeSearch(in.SearchCode, powerCheck)
-			data.SubscribeList = subscribeList*/
+		now4 := time.Now().Unix()
+		subscribeList := &bxcore.SearchMap{}
+		subscribeList.Data = service.SubscribeSearch(in.SearchCode, powerCheck)
+		data.SubscribeList = subscribeList
 		now4 := time.Now().Unix()
 		log.Println("菜单搜索", now4-now3)
-	}
+	}*/
 	return data
 }