From 82b712da53da46ff190f0594ec0fabff06a3300d Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Sat, 9 Mar 2024 15:54:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=8E=82=E5=8C=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Identity/Services/Implements/TenantService.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.Sys/Identity/Services/Implements/TenantService.cs b/Src/Dlhis.Sys/Identity/Services/Implements/TenantService.cs
index ecb8795b..653d2846 100644
--- a/Src/Dlhis.Sys/Identity/Services/Implements/TenantService.cs
+++ b/Src/Dlhis.Sys/Identity/Services/Implements/TenantService.cs
@@ -84,10 +84,21 @@ public class TenantService : ITenantService
              })
              .ToListAsync();
 
-        var currentTenant = myTenants.First(x => x.Code == tenantId);
+        if (!myTenants.Any())
+        {
+            myTenants = await GetListAsync();
+            myTenants = myTenants.Where(x => x.PCode.IsPresent()).ToList();
+        }
+
+        var currentTenant = myTenants.FirstOrDefault(x => x.Code == tenantId);
         var otherTenants = myTenants.Where(x => x.Code != tenantId);
 
-        var result = new List<TenantResponse> { currentTenant };
+        var result = new List<TenantResponse>();
+        if (currentTenant != null)
+        {
+            result.Add(currentTenant);
+        }
+
         result.AddRange(otherTenants);
         return result;
     }