Merge branch 'dev/v4.8.39_dx' of qmx/jy into release/v4.8.39

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -125,13 +125,15 @@ func NoLoginAssociatedInfo(entId string) []map[string]interface{} {
 		randGen := rand.New(rand.NewSource(time.Now().UnixNano()))
 		from := randGen.Intn(100)
 		//关联中标企业
-		r := es.Get("winner", "winner", fmt.Sprintf(`{"query": {"bool": {"must": [{"query_string": {"default_field": "city","query": "%s*"}}]}},"_source": ["_id","name"],"from": %d,"size": 30}`, qutil.InterfaceToStr((*entinfo)["company_area"]), from))
+		r := es.Get("qyxy", "qyxy", fmt.Sprintf(`{"query": {"bool": {"must": [{"query_string": {"default_field": "company_area","query": "%s*"}}]}},"_source": ["_id","company_name"],"from": %d,"size": 30}`, qutil.InterfaceToStr((*entinfo)["company_area"]), from))
 		if r != nil {
 			winnerData = *r
 		}
 
 		for _, v := range winnerData {
 			v["_id"] = encrypt.EncodeArticleId2ByCheck(qutil.InterfaceToStr(v["_id"]))
+			v["name"] = qutil.InterfaceToStr(v["company_name"])
+			delete(v, "company_name")
 		}
 	}
 	return winnerData