diff --git a/Src/Dlhis.Basic/Device/PermissionAnalyzeConstants.cs b/Src/Dlhis.Basic/Device/PermissionAnalyzeConstants.cs index 2232d201..48fdf866 100644 --- a/Src/Dlhis.Basic/Device/PermissionAnalyzeConstants.cs +++ b/Src/Dlhis.Basic/Device/PermissionAnalyzeConstants.cs @@ -4,14 +4,14 @@ namespace Dlhis.Basic.Device; public static class PermissionAnalyzeConstants { - private const string _verb = "PermissionAnalyze"; - public const string User = nameof(AssignTypeEnumType.User) + _verb; - public const string Group = nameof(AssignTypeEnumType.Group) + _verb; - public const string Department = nameof(AssignTypeEnumType.Department) + _verb; - public const string Tenant = nameof(AssignTypeEnumType.Tenant) + _verb; + private const string Verb = "PermissionAnalyze"; + public const string User = nameof(AssignTypeEnumType.User) + Verb; + public const string Group = nameof(AssignTypeEnumType.Group) + Verb; + public const string Department = nameof(AssignTypeEnumType.Department) + Verb; + public const string Tenant = nameof(AssignTypeEnumType.Tenant) + Verb; public static string GetTypeName(AssignTypeEnumType assignTypeEnumType) { - return assignTypeEnumType + _verb; + return assignTypeEnumType + Verb; } } \ No newline at end of file diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs index 218adb8c..f4668515 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs @@ -1,6 +1,7 @@ using Dlhis.Basic.Device.Dtos; using Dlhis.Basic.Device.Request; using Dlhis.Basic.Device.Response; +using Dlhis.Basic.Organization.Dto; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Basic.Enums; using Dlhis.Entity.Device.Entities; @@ -306,7 +307,7 @@ public class DeviceGroupService : IDeviceGroupService .GroupBy(x => x.Factory) .ToDictionary(x => x.Key, x => x.Select(p => p.DepartmentNo).Distinct().ToList()); - var departments = await _dbContext.Queryable().ToListAsync(); + var departments = await _dbContext.Queryable().Select().ToListAsync(); var gainfoByDeptWhere = LinqExpressionExtensions.False(); foreach ((string factory, List departmentNos) in tenantDepartmentNos) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs index e247a849..827020d1 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs @@ -113,7 +113,7 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService var deviceRelationships = await _dbContext.Queryable() .Where(x => x.IsDeleted == false) .ToListAsync(); - var departments = await _dbContext.Queryable().ToListAsync(); + var departments = await _dbContext.Queryable().Select().ToListAsync(); var result = new ConcurrentDictionary>(); @@ -163,7 +163,7 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService List devicePermissions, List deviceGroups, List deviceGroupRelationships, - List departments) + List departments) { var deviceDtos = new List(); diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 552160e8..a4f3ba72 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -1,6 +1,7 @@ using Dlhis.Basic.Device.Dtos; using Dlhis.Basic.Device.Request; using Dlhis.Basic.Device.Response; +using Dlhis.Basic.Organization.Dto; using Dlhis.Basic.Organization.Services; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Basic.Enums; @@ -350,7 +351,7 @@ public class DevicePermissionService : IDevicePermissionService .SingleAsync(); device.ThrowIfNull("设备不存在"); - var departments = await _dbContext.Queryable().ToListAsync(); + var departments = await _dbContext.Queryable().Select().ToListAsync(); //当前设备的分组 var groups = await _dbContext.Queryable() diff --git a/Src/Dlhis.Basic/Device/Services/Implements/PermissionAnalyze/DepartmentPermissionAnalyzeService.cs b/Src/Dlhis.Basic/Device/Services/Implements/PermissionAnalyze/DepartmentPermissionAnalyzeService.cs index 67eb7d5f..17b8130c 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/PermissionAnalyze/DepartmentPermissionAnalyzeService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/PermissionAnalyze/DepartmentPermissionAnalyzeService.cs @@ -1,3 +1,4 @@ +using Dlhis.Basic.Organization.Dto; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Device.Enums; @@ -18,7 +19,7 @@ public class DepartmentPermissionAnalyzeService : BasePermissionAnalyzeService var factory = data[0]; var departmentNo = data[1]; - var departments = await DbContext.Queryable().ToListAsync(); + var departments = await DbContext.Queryable().Select().ToListAsync(); var departmentNos = RecursionHelper.HandlerDepartmentNextCodes(departmentNo, departments); return await DbContext.Queryable() diff --git a/Src/Dlhis.Basic/Dlhis.Basic.csproj b/Src/Dlhis.Basic/Dlhis.Basic.csproj index 111e5c03..00d979c2 100644 --- a/Src/Dlhis.Basic/Dlhis.Basic.csproj +++ b/Src/Dlhis.Basic/Dlhis.Basic.csproj @@ -9,6 +9,10 @@ ..\.. + + 1701;1702;1591 + + diff --git a/Src/Dlhis.Basic/Organization/Dto/DepartmentDto.cs b/Src/Dlhis.Basic/Organization/Dto/DepartmentDto.cs new file mode 100644 index 00000000..34f57083 --- /dev/null +++ b/Src/Dlhis.Basic/Organization/Dto/DepartmentDto.cs @@ -0,0 +1,10 @@ +namespace Dlhis.Basic.Organization.Dto; + +public class DepartmentDto +{ + public string No { get; set; } + + public string PNo { get; set; } + + public string Name { get; set; } +} \ No newline at end of file diff --git a/Src/Dlhis.Basic/RecursionHelper.cs b/Src/Dlhis.Basic/RecursionHelper.cs index cdee2661..2315f2d6 100644 --- a/Src/Dlhis.Basic/RecursionHelper.cs +++ b/Src/Dlhis.Basic/RecursionHelper.cs @@ -1,3 +1,4 @@ +using Dlhis.Basic.Organization.Dto; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Device.Entities; using Kurisu.AspNetCore.Utils.Extensions; @@ -47,7 +48,7 @@ public static class RecursionHelper } - public static List HandlerDepartmentNextCodes(string current, List data) + public static List HandlerDepartmentNextCodes(string current, List data) { var result = new List { current }; @@ -55,7 +56,7 @@ public static class RecursionHelper return result; - static void InternalHandlerCodes(string internalCurrent, List internalData, List internalResult) + static void InternalHandlerCodes(string internalCurrent, List internalData, List internalResult) { var next = internalData.Where(x => x.PNo == internalCurrent); foreach (var item in next) @@ -66,7 +67,7 @@ public static class RecursionHelper } } - public static List HandlerDepartmentPreviousCodes(string current, List data) + public static List HandlerDepartmentPreviousCodes(string current, List data) { var result = new List { current }; @@ -74,7 +75,7 @@ public static class RecursionHelper return result; - static void InternalHandlerCodes(string internalCurrent, List internalData, List internalResult) + static void InternalHandlerCodes(string internalCurrent, List internalData, List internalResult) { var pno = internalData.FirstOrDefault(x => x.No == internalCurrent)?.PNo; if (pno.IsEmpty())