Переглянути джерело

Merge branch 'dev/2.9.38_fu' of jianyu/ent_new into feature/v2.9.38

fuwencai 1 рік тому
батько
коміт
6238f00b4d
1 змінених файлів з 2 додано та 3 видалено
  1. 2 3
      entniche_new/src/service/customer/customer.go

+ 2 - 3
entniche_new/src/service/customer/customer.go

@@ -1042,8 +1042,8 @@ type Bucket struct {
 
 // 聚合查询
 func GetAggs(index, itype, query string, countQuery string) (aggs esV7.Aggregations, res []map[string]interface{}, count int64, msg string) {
-	log.Println("GetAggs query:",query)
-	log.Println("GetAggs countQuery",countQuery)
+	log.Println("GetAggs query:", query)
+	log.Println("GetAggs countQuery", countQuery)
 	count = elastic.Count(index, itype, countQuery)
 	if count > config.Config.ItemsNumber {
 		msg = "搜索目标过于宽泛,请缩小搜索范围。"
@@ -1241,7 +1241,6 @@ func (this *CustomerAction) CstList() {
 		userInfo := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
 		cotion.UserId = qutil.If(userInfo.Pid != "", userInfo.Pid, userId).(string)
 		cotion.Session = this.Session()
-		cotion.UserId = userId
 		cotion.EntUserId = entUserId
 		searchCode := this.GetString("searchCode")
 		isCliam, _ := this.GetInt("isCliam")