Merge branch 'cygx_10.6' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -2321,7 +2321,8 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 		return
 	}
-	condition += `AND art.is_limit_people = 1 ` + conditionActivity
+	//condition += `AND art.is_limit_people = 1 ` + conditionActivity
+	condition += conditionActivity
 	sortTime = ` mintimesort ASC `
 	listActivity, err := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, pageSize)
 	if err != nil {

services/es_comprehensive.go

@@ -361,14 +361,8 @@ func EsAddOrEditComprehensiveData(indexName string, item *ElasticComprehensiveDe
 func EsComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*SearchComprehensiveItem, total int64, err error) {
 	indexName := utils.IndexNameComprehensive
 	client := utils.Client
-	keyWordArr, err := GetIndustryMapNameSliceV3(keyWord)
-	keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
-	keyWordLen := len(keyWordArr)
-	if keyWordLen <= 0 {
-		keyWordArr = append(keyWordArr, keyWord)
-		keyWordLen = len(keyWordArr)
-	}
-	fmt.Println(keyWordArr)
+	var keyWordArr []string
+	keyWordArr = append(keyWordArr, keyWord)
 
 	//Es 的高级查询有 自定义排序 文档一时半会儿撸不懂，先做多次查询手动过滤 2023.2.2
 	//ikType 查询方式 ，0：查所有 、 1:查询键入词 、 2：查询除了查询键入词之外的联想词
@@ -379,8 +373,6 @@ func EsComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*S
 	mustNotMap := make([]interface{}, 0)
 	shouldNotMap := make(map[string]interface{}, 0)
 	shouldNotMapquery := make([]interface{}, 0)
-	// @Param   OrderColumn   query   int  true       "排序字段 ，Comprehensive综合 ，Matching匹配度 ，PublishDate 发布时间 "
-	//keyWordWeight := GetWeight(keyWordLen)
 	var boost int
 	//lenkeyWordArr := len(keyWordArr)
 	for k, v := range keyWordArr {
@@ -1034,9 +1026,11 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			}
 		}
 	}
-
 	for _, vList := range list {
 		for _, v := range mapItems {
+			if mapItems["Article"] == nil && mapItems["Newchart"] == nil && mapItems["Roadshow"] == nil && mapItems["Activity"] == nil && mapItems["Activityvideo"] == nil && mapItems["Activityvoice"] == nil && mapItems["Activityspecial"] == nil && mapItems["Researchsummary"] == nil && mapItems["Minutessummary"] == nil && mapItems["Meetingreviewchapt"] == nil && mapItems["ProductInterior"] == nil && mapItems["IndustrialResource"] == nil {
+				continue
+			}
 			if v.SourceId == vList.SourceId {
 				items = append(items, v)
 			}