Merge branch 'crm_optimize_257_1029@guomengyuan' into debug

controllers/eta_trial.go

@@ -1190,8 +1190,10 @@ func (this *ETATrialController) AccountList() {
 		condition += ` AND (user_name LIKE '%` + keyWord + `%' OR company_name LIKE '%` + keyWord + `%' OR mobile LIKE '%` + keyWord + `%') `
 	}
 
-	condition += ` AND seller_id = ? `
-	pars = append(pars, sysUser.AdminId)
+	if sysUser.RoleTypeCode != "admin" && sysUser.RoleTypeCode != "ficc_admin" {
+		condition += ` AND seller_id = ? `
+		pars = append(pars, sysUser.AdminId)
+	}
 
 	total, err := eta_trial.GetETATrialListCount(condition, pars)
 	if err != nil {