From 6cf4381c534d05496d9842b06e0460af333fc0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=91=E8=B1=AA=20=E5=BB=96?= <liaojinhao@tbksh-sys.com>
Date: Tue, 2 Jul 2024 00:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/SysUnit/Dto/SysUnitGroupInput.cs  | 13 +++++++++++
 .../Service/SysUnit/SysUnitGroupService.cs    | 23 +++++++++++++++----
 .../Service/SysUnit/SysUnitService.cs         | 17 ++++++++++++++
 .../Admin.NET.Core/Admin.NET.Core.csproj      |  1 -
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/Admin.NET/Admin.NET.Application/Service/SysUnit/Dto/SysUnitGroupInput.cs b/Admin.NET/Admin.NET.Application/Service/SysUnit/Dto/SysUnitGroupInput.cs
index e8793b9..1bd1e65 100644
--- a/Admin.NET/Admin.NET.Application/Service/SysUnit/Dto/SysUnitGroupInput.cs
+++ b/Admin.NET/Admin.NET.Application/Service/SysUnit/Dto/SysUnitGroupInput.cs
@@ -143,3 +143,16 @@ public class QueryByIdSysUnitGroupInput : DeleteSysUnitGroupInput
 {
 
 }
+
+/// <summary>
+/// 单位组检查输入参数
+/// </summary>
+public class CheckSysUnitGroupInput : SysUnitGroupBaseInput
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    [Required(ErrorMessage = "主键Id不能为空")]
+    public long Id { get; set; }
+
+}
diff --git a/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitGroupService.cs b/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitGroupService.cs
index e446c99..5af701b 100644
--- a/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitGroupService.cs
+++ b/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitGroupService.cs
@@ -11,9 +11,14 @@ namespace Admin.NET.Application;
 public class SysUnitGroupService : IDynamicApiController, ITransient
 {
     private readonly SqlSugarRepository<SysUnitGroup> _rep;
-    public SysUnitGroupService(SqlSugarRepository<SysUnitGroup> rep)
+
+    private readonly SysUnitService _sysUnitService;
+
+    public SysUnitGroupService(SqlSugarRepository<SysUnitGroup> rep,
+       SysUnitService sysUnitService )
     {
         _rep = rep;
+        _sysUnitService = sysUnitService;
     }
 
     /// <summary>
@@ -101,9 +106,17 @@ public class SysUnitGroupService : IDynamicApiController, ITransient
         return await _rep.AsQueryable().Where(a => !a.IsDelete).Select<SysUnitGroupOutput>().ToListAsync();
     }
 
-
-
-
-
+    /// <summary>
+    /// 检查单位是否存在数据
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [ApiDescriptionSettings(Name = "CheckUnitList")]
+    public async Task<bool> CheckUnitList(CheckSysUnitGroupInput input)
+    {
+        var sysUnits = await _sysUnitService.ListByGroupId(input.Id);
+        return sysUnits.Any();
+    }
 }
 
diff --git a/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs b/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs
index 1bc22d9..ec10e43 100644
--- a/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs
+++ b/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs
@@ -2,6 +2,7 @@
 using Admin.NET.Application.Const;
 using Admin.NET.Application.Entity;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
 namespace Admin.NET.Application;
 /// <summary>
 /// 单位服务
@@ -171,5 +172,21 @@ public class SysUnitService : IDynamicApiController, ITransient
         return result;
     }
 
+    /// <summary>
+    /// 校验基本单位是否唯一
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [ApiDescriptionSettings(Name = "checkBaseUnit")]
+    public async Task<SysUnit> CheckBaseUnit(AddSysUnitInput input)
+    {
+       var result = await _rep.AsQueryable()
+            .Where(a => !a.IsDelete && a.IsBaseUnit==true)
+            .WhereIF(input.GroupUnitId > 0, u => u.GroupUnitId == input.GroupUnitId)
+            .FirstAsync();
+
+        return result;
+    }
 }
 
diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index a564476..a6dd4b9 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -13,7 +13,6 @@
   <ItemGroup>
     <None Remove="Admin.NET.Core.xml" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="2.0.24" />
     <PackageReference Include="AngleSharp" Version="1.1.2" />