Merge branch 'CRM_14.7.2' into debug

controllers/company.go

@@ -692,7 +692,7 @@ func (this *CompanyController) List() {
 				if status == "全部" {
 					////如果是筛选了流失客户状态
 					if sysUser.Authority <= 0 {
-						condition += ` AND (b.seller_id=? OR status='流失')  `
+						condition += ` AND (b.seller_id=? OR status='流失' OR (b.share_seller_id = ? AND b.is_share = 1))  `
 						pars = append(pars, sysUser.AdminId)
 
 						permissionCondition += ` AND b.seller_id=? `