From 8ec06d9199f17ceb94b2622aa7a97803eec2fa34 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 14 Jan 2022 23:30:18 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=20IDict=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=BA=20ExistsAppId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/DictService.cs                                   | 4 ++--
 src/blazor/admin/BootstrapAdmin.Web.Core/IDict.cs             | 2 +-
 .../admin/BootstrapAdmin.Web/Validators/AppIdValidator.cs     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs
index e73393f6..f29e3490 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/DictService.cs
@@ -411,9 +411,9 @@ class DictService : IDict
         return dicts.Where(s => s.Category == "应用首页" && s.Name == name).FirstOrDefault()?.Code ?? "";
     }
 
-    public string? GetAppNameByAppName(string name)
+    public bool ExistsAppId(string appId)
     {
         var dicts = GetAll();
-        return dicts.Where(s => s.Category == "应用程序" && s.Code == name).FirstOrDefault()?.Name;
+        return dicts.Exists(s => s.Category == "应用程序" && s.Code == appId);
     }
 }
diff --git a/src/blazor/admin/BootstrapAdmin.Web.Core/IDict.cs b/src/blazor/admin/BootstrapAdmin.Web.Core/IDict.cs
index a4608fbf..5d313262 100644
--- a/src/blazor/admin/BootstrapAdmin.Web.Core/IDict.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web.Core/IDict.cs
@@ -371,5 +371,5 @@ public interface IDict
     /// 获得前台应用
     /// </summary>
     /// <returns></returns>
-    string? GetAppNameByAppName(string name);
+    bool ExistsAppId(string appId);
 }
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Validators/AppIdValidator.cs b/src/blazor/admin/BootstrapAdmin.Web/Validators/AppIdValidator.cs
index 05910c9d..591059bf 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Validators/AppIdValidator.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Validators/AppIdValidator.cs
@@ -29,8 +29,8 @@ public class AppIdValidator : IValidator
     /// <param name="results"></param>
     public void Validate(object? propertyValue, ValidationContext context, List<ValidationResult> results)
     {
-        var AppName = DictService.GetAppNameByAppName(propertyValue?.ToString()!);
-        if (!string.IsNullOrEmpty(AppName))
+        var check = DictService.ExistsAppId(propertyValue?.ToString()!);
+        if (check)
         {
             ErrorMessage = $"{context.DisplayName}已存在";
         }