Merge branch 'CRM_12.8'

models/roadshow/company.go

@@ -125,13 +125,13 @@ func CompanySearchV2(sellerId int, keyWord string) (list []*CompanySearchView, e
 	}
 	sql := `SELECT
 				b.company_id,
-				b.company_name,
+				a.company_name,
 				0 AS english_company
 			FROM
 				company AS a
 			INNER JOIN company_product AS b ON a.company_id = b.company_id
 			WHERE
-				b.status IN ('正式', '试用') AND b.seller_id = ? AND b.company_name LIKE ?
+				b.status IN ('正式', '试用') AND (b.seller_id = ? OR a.share_seller_id=?) AND a.company_name LIKE ?
 			GROUP BY
 				b.company_id
 			UNION
@@ -144,6 +144,6 @@ func CompanySearchV2(sellerId int, keyWord string) (list []*CompanySearchView, e
 				WHERE
 					is_deleted = 0 AND enabled > 0 AND company_name LIKE ?`
 	sql = fmt.Sprintf(sql, rddp)
-	_, err = o.Raw(sql, sellerId, keyWord, keyWord).QueryRows(&list)
+	_, err = o.Raw(sql, sellerId, sellerId, keyWord, keyWord).QueryRows(&list)
 	return
 }