Merge branch 'feature/eta_optimize_257_250115@chenhan' of eta_forum/eta_forum_admin into master

controllers/eta_trial.go

@@ -70,11 +70,12 @@ func (this *ETATrialController) List() {
 	startSize = paging.StartIndex(currentIndex, pageSize)
 	var condition string
 	var pars []interface{}
-
-	if sysUser.RoleTypeCode != "admin" && sysUser.RoleTypeCode != "ficc_admin" {
-		condition += ` AND seller_id = ? `
-		pars = append(pars, sysUser.AdminId)
-	} else if isOnlyMe {
+	//优化需求257,放开销售也可以查看全部记录
+	//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)
 	}