Merge branch 'fix/2023-11-15' into debug

services/elastic.go

@@ -374,20 +374,20 @@ func SearcCygxArticleHistoryData(indexName, keyword, startDate, endDate, company
 	//机构阅读数量
 	sortMap := make([]interface{}, 0)
 	//如果是一家公司就不按照这个字段排序
-	if len(seliceid) > 1 {
-		sortMap = append(sortMap, map[string]interface{}{
-			"CompanyArticleHistoryNum": map[string]interface{}{
-				"order": "desc",
-			},
-		})
-	}
-
-	//用户阅读数量
-	sortMap = append(sortMap, map[string]interface{}{
-		"UserArticleHistoryNum": map[string]interface{}{
-			"order": "desc",
-		},
-	})
+	//if len(seliceid) > 1 {
+	//	sortMap = append(sortMap, map[string]interface{}{
+	//		"CompanyArticleHistoryNum": map[string]interface{}{
+	//			"order": "desc",
+	//		},
+	//	})
+	//}
+	//
+	////用户阅读数量
+	//sortMap = append(sortMap, map[string]interface{}{
+	//	"UserArticleHistoryNum": map[string]interface{}{
+	//		"order": "desc",
+	//	},
+	//})
 	//时间
 	sortMap = append(sortMap, map[string]interface{}{
 		"CreateTime": map[string]interface{}{

utils/constants.go

@@ -158,7 +158,7 @@ const (
 	COMPANY_PRODUCT_RAI_NAME  = "权益"
 )
 
-var PermissionFiccClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业", "市场策略"}
+var PermissionFiccClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业", "新能源", "市场策略"}
 var PermissionAllClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业", "市场策略", "权益"}
 
 //apply_method:申请类型：1:试用->正式,2:冻结—>试用,3:流失—>正式,4:试用延期,5:原销售申请领取流失客户，6:正式客户申请服务更新