免费用户可以筛选采购单位画像

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

@@ -273,40 +273,37 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 
 	sTime, eTime := pwp.Screen.PareTimeSelect()
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"firsttime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
-	if pwp.Screen.HasPower {
-		//文本输入框，字数限制50个字，超过上限不再允许输入内容
-		if pwp.Screen.Match != "" {
-			if pareWord := pwp.Screen.PareMatchWord(); pareWord != "" {
-				findFields := fmt.Sprintf(`"%s"`, strings.Join(pwp.Screen.PareMatchType(false), "\",\""))
-				var keywordArr []string
-				for _, keyword := range strings.Split(pareWord, " ") {
-					if keyword == "" {
-						continue
-					}
-					keywordArr = append(keywordArr, fmt.Sprintf(multi_match, keyword, findFields))
-				}
-				if pwp.Screen.ExactMatch { //精确匹配(必须包含每个关键词)
-					mustQueryArr = append(mustQueryArr, fmt.Sprintf(must_match, strings.Join(keywordArr, ",")))
-				} else { //模糊匹配(只需包含一个关键词)
-					mustQueryArr = append(mustQueryArr, fmt.Sprintf(should_match, strings.Join(keywordArr, ",")))
+
+	//文本输入框，字数限制50个字，超过上限不再允许输入内容
+	if pwp.Screen.Match != "" {
+		if pareWord := pwp.Screen.PareMatchWord(); pareWord != "" {
+			findFields := fmt.Sprintf(`"%s"`, strings.Join(pwp.Screen.PareMatchType(false), "\",\""))
+			var keywordArr []string
+			for _, keyword := range strings.Split(pareWord, " ") {
+				if keyword == "" {
+					continue
 				}
+				keywordArr = append(keywordArr, fmt.Sprintf(multi_match, keyword, findFields))
+			}
+			if pwp.Screen.ExactMatch { //精确匹配(必须包含每个关键词)
+				mustQueryArr = append(mustQueryArr, fmt.Sprintf(must_match, strings.Join(keywordArr, ",")))
+			} else { //模糊匹配(只需包含一个关键词)
+				mustQueryArr = append(mustQueryArr, fmt.Sprintf(should_match, strings.Join(keywordArr, ",")))
 			}
 		}
+	}
 
-		//按照当前年份，往前推4年，共5个年份可选
-		sTime, eTime := pwp.Screen.PareTimeSelect()
-		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"firsttime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
-
-		//地区多选，选项：全部（初始值）、项目地区（省、直辖市）
-		if pwp.Screen.Area != "" {
-			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"area":["%s"]}}`, strings.ReplaceAll(pwp.Screen.Area, ",", "\",\"")))
-		}
+	//地区多选，选项：全部（初始值）、项目地区（省、直辖市）
+	if pwp.Screen.Area != "" {
+		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"area":["%s"]}}`, strings.ReplaceAll(pwp.Screen.Area, ",", "\",\"")))
+	}
 
-		//行业多选
-		if pwp.Screen.ScopeClass != "" {
-			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"s_subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
-		}
+	//行业多选
+	if pwp.Screen.ScopeClass != "" {
+		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"s_subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+	}
 
+	if pwp.Screen.HasPower {
 		pwp.PageNum = qutil.If(pwp.PageNum == 0, 1, pwp.PageNum).(int)     //默认第一页
 		pwp.PageSize = qutil.If(pwp.PageSize == 0, 10, pwp.PageSize).(int) //默认每页10条
 	} else { //免费用户可以查看三条