Merge branch 'feature/v4.9.33' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.9.33_wmh

src/jfw/modules/bigmember/src/entity/marketAnalysis/analysisPdf.go

@@ -166,6 +166,7 @@ func (this *AnalysisReportPdf) GetPdfDetail() {
 						TimeRange:  qutil.InterfaceToStr((*rData)["timeRange"]),
 						HasPower:   true,
 					},
+					Free:     false,
 					PageNum:  1,
 					PageSize: 100,
 				})
@@ -220,6 +221,7 @@ func (this *AnalysisReportPdf) GetPdfDetail() {
 						HasPower:   true,
 						BuyerClass: qutil.InterfaceToStr((*rData)["buyerClass"]),
 					},
+					Free:     false,
 					PageNum:  1,
 					PageSize: 100,
 				})

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

@@ -19,7 +19,7 @@ import (
 
 const (
 	matchWordLenLimit                = 50
-	tableShowNumLimit                = 40
+	tableShowNumLimit                = 100 //pdf导出数据修改为100
 	dataExportBatchSearchLimit int64 = 500
 	biddingIndex, biddingType        = "bidding", "bidding"
 	projectIndex, projectType        = "projectset", "projectset"
@@ -278,7 +278,6 @@ func (pwp *PortraitProjectScreen) GetWinnerListSearch() (list *[]map[string]inte
 	mustQueryArr := pwp.CommonPare(true)
 	pwp.PageNum = qutil.If(pwp.PageNum == 0, 1, pwp.PageNum).(int)     //默认第一页
 	pwp.PageSize = qutil.If(pwp.PageSize == 0, 10, pwp.PageSize).(int) //默认每页10条
-
 	if !pwp.Screen.HasPower || pwp.Free {
 		return pwp.FreePortraitNews(mustQueryArr, true)
 	}
@@ -295,7 +294,7 @@ func (pwp *PortraitProjectScreen) GetWinnerListSearch() (list *[]map[string]inte
 	}
 	start, limit := (pwp.PageNum-1)*pwp.PageSize, pwp.PageSize
 	fields := `"_id","projectname","bidamount","budget","title","publishtime","subtype","toptype","area"`
-	if start+limit <= tableShowNumLimit { //展示表格数据
+	if start+limit <= tableShowNumLimit { //展示表格数据||pdf导出数据
 		fields += `,"bidopentime","buyer"`
 	}
 	//列表查询

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -194,6 +194,9 @@ func (this *SubVipPortrait) SubVipPortrait() {
 		if err != nil {
 			return nil, err
 		}
+		if userId == "" && power <= 1 {
+			return nil, fmt.Errorf("无查看权益")
+		}
 		rData, err := cepm.WinnerPortraitData(&entity.PortraitScreen{
 			Ent:        entId,
 			Match:      this.GetString("match"),
@@ -464,7 +467,7 @@ func (this *SubVipPortrait) BuyerPortrait() {
 			return nil, err
 		}
 		redisKey := fmt.Sprintf("buyerPortraitKey_%s", buyerName)
-		if userId == "" || power <= 1 {
+		if userId == "" && power <= 1 {
 			if bytes, err := redis.GetBytes("other", redisKey); err == nil && bytes != nil {
 				rData := make(map[string]interface{})
 				if err = json.Unmarshal(*bytes, &rData); err != nil {

src/jfw/modules/subscribepay/src/util/pdfSendEmail.go

@@ -96,15 +96,17 @@ func PdfSendEmail(rData map[string]interface{}) error {
 		)
 		if err := json.Unmarshal([]byte(qutil.InterfaceToStr(rData["s_keysItems"])), &mae.FormatParam.KeysItems); err == nil {
 			for _, item := range mae.FormatParam.KeysItems {
+				var keyGroup []string
 				for _, word := range item.A_Key {
 					matchWayStr := "(精准)"
 					if word.MatchWay == 1 {
 						matchWayStr = "(模糊)"
 					}
-					for _, s := range word.Keyword {
-						keyWords = append(keyWords, fmt.Sprintf("%s %s", s, matchWayStr))
-					}
+					keyGroup = append(keyGroup, word.Keyword...)
+					keyGroup = append(keyGroup, word.Appended...)
+					keyGroup = append(keyGroup, matchWayStr)
 				}
+				keyWords = append(keyWords, strings.Join(keyGroup, " "))
 			}
 		}
 		matchingMode = qutil.If(qutil.InterfaceToStr(rData["s_matchingMode"]) == "title", "【按标题匹配】", "【按全文匹配】").(string)