fix bug

models/company.go

@@ -15,7 +15,7 @@ func GetCompanyDetailById(companyId int) (item *CompanyDetail, err error) {
 	sql := ` SELECT a.company_id,a.company_name,b.status,b.seller_id,b.seller_name,c.mobile 
             FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
-			INNER JOIN admin AS c ON b.seller_id=c.admin_id
+			LEFT JOIN admin AS c ON b.seller_id=c.admin_id
 			WHERE a.company_id=? AND  b.product_id=2 `
 	o := orm.NewOrm()
 	err = o.Raw(sql, companyId).QueryRow(&item)
@@ -26,7 +26,7 @@ func GetCompanyPermission(companyId int) (permission string, err error) {
 	sql := ` SELECT GROUP_CONCAT(DISTINCT b.chart_permission_name SEPARATOR ',') AS permission
 			FROM company_report_permission AS a
 			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
-			INNER JOIN company_product AS c ON a.company_id=c.company_id
+			INNER JOIN company_product AS c ON a.company_id=c.company_id AND a.product_id=c.product_id
 			WHERE  a.company_id=?
 			AND a.product_id=2
 			AND c.status IN('正式','试用','永续') `

services/elasticsearch.go

@@ -151,6 +151,11 @@ func SearchByKeyWord(keyWord string) (result []*models.SearchItem, err error) {
 	fmt.Println("keyWord:",keyWord)
 	pageSize := 20
 	keyWordArr, err := GetIndustryMapNameSlice(keyWord)
+	keyWordArr=RemoveDuplicatesAndEmpty(keyWordArr)
+
+	fmt.Println(keyWordArr)
+	fmt.Println(" keyWordArr ")
+
 	if err != nil {
 		go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+"异常提醒:", "GetIndustryMapNameSlice："+err.Error(), utils.EmailSendToUsers)
 	}
@@ -366,3 +371,14 @@ func esSearch(keyWord, categoryName string) (result []*models.SearchItem, err er
 	}
 	return
 }
+
+func RemoveDuplicatesAndEmpty(a []string) (ret []string){
+	a_len := len(a)
+	for i:=0; i < a_len; i++{
+		if (i > 0 && a[i-1] == a[i]) || len(a[i])==0{
+			continue;
+		}
+		ret = append(ret, a[i])
+	}
+	return
+}