更新接口

go/services/tenant_lookup.go

@@ -8,31 +8,25 @@ import (
 	"server/models"
 )
 
-
 func findTenantByLoginName(loginName string) (*models.SystemTenant, error) {
 	loginName = strings.TrimSpace(loginName)
 	if loginName == "" {
 		return nil, orm.ErrNoRows
 	}
-	
-	qs := models.Orm.QueryTable(new(models.SystemTenant)).
-		Filter("status", 1).
-		Filter("delete_time__isnull", true)
 
-	tenant := &models.SystemTenant{}
-	err := qs.Filter("tenant_name", loginName).One(tenant)
-	if err == nil {
-		return tenant, nil
+	baseQuery := func() orm.QuerySeter {
+		return models.Orm.QueryTable(new(models.SystemTenant)).
+			Filter("status", 1).
+			Filter("delete_time__isnull", true)
 	}
 
-	tenant = &models.SystemTenant{}
-	err = models.Orm.QueryTable(new(models.SystemTenant)).
-		Filter("status", 1).
-		Filter("delete_time__isnull", true).
-		Filter("tenant_code", loginName).
-		One(tenant)
-	if err != nil {
-		return nil, err
+	// 登录时支持租户全称、租户简称和租户编码。
+	for _, field := range []string{"tenant_name", "tenant_short_name", "tenant_code"} {
+		tenant := &models.SystemTenant{}
+		if err := baseQuery().Filter(field, loginName).One(tenant); err == nil {
+			return tenant, nil
+		}
 	}
-	return tenant, nil
+
+	return nil, orm.ErrNoRows
 }