Merge branch 'crm_optimize_257_1029@guomengyuan' into debug

controllers/eta_trial.go

@@ -70,10 +70,14 @@ func (this *ETATrialController) List() {
 	var condition string
 	var pars []interface{}
 
-	if isOnlyMe {
+	if sysUser.RoleTypeCode != "admin" && sysUser.RoleTypeCode != "ficc_admin" {
+		condition += ` AND seller_id = ? `
+		pars = append(pars, sysUser.AdminId)
+	} else if isOnlyMe {
 		condition += ` AND seller_id = ? `
 		pars = append(pars, sysUser.AdminId)
 	}
+
 	if keyWord != "" {
 		condition += ` AND (user_name LIKE '%` + keyWord + `%' OR company_name LIKE '%` + keyWord + `%' ) `
 	}