Merge branch 'feature/eta2.3.4_business_user' into debug

controllers/eta_business/user.go

@@ -699,8 +699,7 @@ func (this *EtaBusinessUserController) ImportList() {
 					continue
 				}
 				if countryCode == "" {
-					utils.FileLog.Info("导入数据中存在【国际区号】为空的用户，请检查")
-					continue
+					countryCode = "86"
 				}
 
 				if businessName == "" && creditCode == "" {
@@ -1051,6 +1050,9 @@ func (this *EtaBusinessUserController) Import() {
 	for _, v := range req.ValidUser {
 		// 查询商户信息
 		item := new(models.User)
+		if v.CountryCode == "" {
+			v.CountryCode = "86"
+		}
 		item.CountryCode = v.CountryCode
 		item.RealName = v.RealName
 		item.PositionStatus = v.PositionStatus

controllers/eta_trial.go

@@ -71,10 +71,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 + `%' ) `
 	}
@@ -1155,8 +1159,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 {