feat: 语言接口调整只返回中文和英文

WangJunZzz · Nov 15, 2024 · ec565dc · ec565dc
1 parent 50e2334
commit ec565dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...Management/src/Lion.AbpPro.LanguageManagement.Application/Languages/LanguageAppService.cs b/...Management/src/Lion.AbpPro.LanguageManagement.Application/Languages/LanguageAppService.cs
@@ -22,8 +22,7 @@ public virtual async Task<List<PageLanguageOutput>> AllListAsync()
     {
         var languages = await _languageManager.ListAsync();
         var list = ObjectMapper.Map<List<Language>, List<PageLanguageOutput>>(languages);
-        // 前端只支持这2种语言，其他语言不显示
-        return list.Where(e => e.CultureName == "zh-Hans" || e.CultureName == "en").ToList();
+        return list.ToList();
     }
 
 

diff --git a/...eManagement.EntityFrameworkCore/EntityFrameworkCore/Languages/EfCoreLanguageRepository.cs b/...eManagement.EntityFrameworkCore/EntityFrameworkCore/Languages/EfCoreLanguageRepository.cs
@@ -14,10 +14,11 @@ public EfCoreLanguageRepository(IDbContextProvider<ILanguageManagementDbContext>
     public virtual async Task<List<Language>> ListAsync(bool? isEnabled = null)
     {
         return await (await GetDbSetAsync())
+            .Where(e => e.CultureName == "zh-Hans" || e.CultureName == "en")
             .WhereIf(isEnabled != null, e => e.IsEnabled == isEnabled)
             .ToListAsync();
     }
-    
+
     /// <summary>
     /// 查询语言
     /// </summary>
@@ -27,6 +28,7 @@ public virtual async Task<List<Language>> ListAsync(bool? isEnabled = null)
     public async Task<List<Language>> ListAsync(int maxResultCount = 10, int skipCount = 0, string filter = null)
     {
         return await (await GetDbSetAsync())
+            .Where(e => e.CultureName == "zh-Hans" || e.CultureName == "en")
             .WhereIf(filter.IsNotNullOrWhiteSpace(), e => e.CultureName.Contains(filter) || e.UiCultureName.Contains(filter) || e.DisplayName.Contains(filter))
             .OrderByDescending(e => e.CreationTime)
             .PageBy(skipCount, maxResultCount)
@@ -37,9 +39,10 @@ public async Task<List<Language>> ListAsync(int maxResultCount = 10, int skipCou
     /// 获取总条数
     /// </summary>
     /// <param name="filter">查询条件 cultureName or uiCultureName or displayName</param>
-    public async Task<long> CountAsync( string filter = null)
+    public async Task<long> CountAsync(string filter = null)
     {
         return await (await GetDbSetAsync())
+            .Where(e => e.CultureName == "zh-Hans" || e.CultureName == "en")
             .WhereIf(filter.IsNotNullOrWhiteSpace(), e => e.CultureName.Contains(filter) || e.UiCultureName.Contains(filter) || e.DisplayName.Contains(filter))
             .CountAsync();
     }