Merge branch 'CRM_14.7.2' into debug

models/company/company_product.go

@@ -497,7 +497,7 @@ func GetCompanyProductByCompanyIdAndSellerId(companyId, sellerId int) (item *Com
 
 // GetCompanyProductsByCompanyIds 根据客户id集合字符串获取所有客户产品列表
 func GetCompanyProductsBySellerId(sellerId string) (items []*CompanyProduct, err error) {
-	sql := `SELECT * FROM company_product WHERE seller_id in (` + sellerId + `) `
+	sql := `SELECT * FROM company_product WHERE (seller_id in (` + sellerId + `) OR share_seller_id IN  (` + sellerId + `) )`
 	o := orm.NewOrm()
 	_, err = o.Raw(sql).QueryRows(&items)
 	return