xyxie 3 月之前
父节点
当前提交
72c2b43cc7
共有 2 个文件被更改,包括 10 次插入5 次删除
  1. 1 2
      controllers/eta_business/user.go
  2. 9 3
      controllers/eta_trial.go

+ 1 - 2
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 == "" {

+ 9 - 3
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 {