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
{
}
+
+///
+/// 单位组检查输入参数
+///
+public class CheckSysUnitGroupInput : SysUnitGroupBaseInput
+{
+ ///
+ /// 主键Id
+ ///
+ [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 _rep;
- public SysUnitGroupService(SqlSugarRepository rep)
+
+ private readonly SysUnitService _sysUnitService;
+
+ public SysUnitGroupService(SqlSugarRepository rep,
+ SysUnitService sysUnitService )
{
_rep = rep;
+ _sysUnitService = sysUnitService;
}
///
@@ -101,9 +106,17 @@ public class SysUnitGroupService : IDynamicApiController, ITransient
return await _rep.AsQueryable().Where(a => !a.IsDelete).Select().ToListAsync();
}
-
-
-
-
+ ///
+ /// 检查单位是否存在数据
+ ///
+ ///
+ ///
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "CheckUnitList")]
+ public async Task 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;
///
/// 单位服务
@@ -171,5 +172,21 @@ public class SysUnitService : IDynamicApiController, ITransient
return result;
}
+ ///
+ /// 校验基本单位是否唯一
+ ///
+ ///
+ ///
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "checkBaseUnit")]
+ public async Task 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 @@
-