Merge branch 'dev4.5.2' of http://192.168.3.207:8080/qmx/jy into dev4.5.2

src/jfw/front/supsearch.go

@@ -250,14 +250,6 @@ func (p *Pcsearch) PcSearchIndex() error {
 	var buyerclass string = ""                    //采购单位类别
 	selectType := p.GetString("selectType")
 
-	vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
-	isPayedUser := vipStatus.IsPayedUser()
-	queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
-	if isPayedUser {
-		buyerclass = p.GetString("buyerclass")
-		hasBuyerTel, hasWinnerTel = p.GetString("buyertel"), p.GetString("winnertel")
-	}
-
 	//历史导出数据回显
 	if strings.Contains(p.Url(), "?goback") {
 		keywords = util.ObjToString(p.GetSession("Echo_keywords"))
@@ -273,6 +265,14 @@ func (p *Pcsearch) PcSearchIndex() error {
 		hasWinnerTel = util.ObjToString(p.GetSession("Echo_hasWinnertel"))
 		industry = util.ObjToString(p.GetSession("Echo_industry"))
 	}
+	vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userId)
+	isPayedUser := vipStatus.IsPayedUser()
+	queryItems := vipStatus.GetQueryItems(selectType, util.Int64All(config.Sysconfig["bidSearchOldUserLimit"]))
+	if isPayedUser {
+		buyerclass = p.GetString("buyerclass")
+		hasBuyerTel, hasWinnerTel = p.GetString("buyertel"), p.GetString("winnertel")
+	}
+
 	b_word, s_word := "", ""
 	if keywords != "" {
 		b_word, _, s_word = jy.InterceptSearchKW(keywords, false, len(industry) == 0)