Merge branch 'crm_13.7'

models/company_product.go

@@ -250,11 +250,11 @@ func GetRemindCompany(sellerId int, endDate string) (items []*CompanyProduct, er
 	company a
 	INNER JOIN company_product AS b ON a.company_id = b.company_id 
 WHERE
-	b.seller_id = ? 
+	(b.seller_id = ? OR a.share_seller_id =?)
 	AND (
 		( b.contract_end_date = ? AND b.status = "正式" )  OR (b.end_date = ? AND b.status = "试用")
   ) ORDER BY b.status DESC `
-	_, err = o.Raw(sql, sellerId, endDate, endDate).QueryRows(&items)
+	_, err = o.Raw(sql, sellerId, sellerId, endDate, endDate).QueryRows(&items)
 	return
 }