合并冲突

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)
 	}

utils/common.go

@@ -1320,6 +1320,7 @@ func ContainsChinese(str string) bool {
 	}
 	return false
 }
+
 func TimeTransferString(format string, t time.Time) string {
 	str := t.Format(format)
 	if t.IsZero() {