diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs index 54647d5a..3f796a97 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs @@ -1,20 +1,16 @@ using Dlhis.Basic.Organization.Response; using Dlhis.Entity.Basic.Entity; -using Dlhis.Sys.Api; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; -using Mapster; namespace Dlhis.Basic.Organization.Services.Implements; public class DepartmentService : IDepartmentService { private readonly IDbContext _dbContext; - private readonly ITenantApi _tenantApi; - public DepartmentService(IDbContext dbContext, ITenantApi tenantApi) + public DepartmentService(IDbContext dbContext) { _dbContext = dbContext; - _tenantApi = tenantApi; } public async Task> GetTreeAsync() @@ -23,29 +19,8 @@ public class DepartmentService : IDepartmentService //00001000 一定是这个开头的 var tops = departments.Where(x => x.PNo == "00001000").ToList(); - tops.ForEach(x => - { - RecursionGetNext(x, departments); - }); - - var myTenantResult = await _tenantApi.GetMyTenantsAsync(); - var tenants = myTenantResult.Data; - - return tenants.Select(x => new DepartmentTreeResponse - { - Name = x.Name, - No = x.Code, - PNo = null, - Tenant = x.Code, - CurrentNext = tops.Select(item => - { - var i = item.Adapt(); - i.PNo = x.Code; - return i; - - }).ToList() - }) - .ToList(); + tops.ForEach(x => { RecursionGetNext(x, departments); }); + return tops; } //***************************************************** help methods **************************************************************** @@ -53,13 +28,10 @@ public class DepartmentService : IDepartmentService private static void RecursionGetNext(DepartmentTreeResponse current, List data) { var next = data.Where(x => x.PNo == current.No).ToList(); - if (next.Any()) + current.CurrentNext = next; + foreach (var item in next) { - current.CurrentNext = next; - foreach (var item in next) - { - RecursionGetNext(item, data); - } + RecursionGetNext(item, data); } } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Basic/Packs/SqlSugarPack.cs b/Src/Dlhis.Basic/Packs/SqlSugarPack.cs index ec794301..64217444 100644 --- a/Src/Dlhis.Basic/Packs/SqlSugarPack.cs +++ b/Src/Dlhis.Basic/Packs/SqlSugarPack.cs @@ -59,17 +59,17 @@ public class SqlSugarPack : BaseAppPack return; } - using var scope = app.ApplicationServices.CreateScope(); - var db = scope.ServiceProvider.GetService(); - var tables = App.ActiveTypes.Where(x => x.IsDefined(typeof(SugarTable), false)) - .Where(x => !x.IsDefined(typeof(SkipScanAttribute), false)) - .ToArray(); - - db.Client.DbMaintenance.CreateDatabase(); - db.Client.CodeFirst.InitTables(tables); - - var faceDb = db.ChangeDb("face"); - faceDb.Client.DbMaintenance.CreateDatabase(); - faceDb.Client.CodeFirst.InitTables(); + // using var scope = app.ApplicationServices.CreateScope(); + // var db = scope.ServiceProvider.GetService(); + // var tables = App.ActiveTypes.Where(x => x.IsDefined(typeof(SugarTable), false)) + // .Where(x => !x.IsDefined(typeof(SkipScanAttribute), false)) + // .ToArray(); + // + // db.Client.DbMaintenance.CreateDatabase(); + // db.Client.CodeFirst.InitTables(tables); + // + // var faceDb = db.ChangeDb("face"); + // faceDb.Client.DbMaintenance.CreateDatabase(); + // faceDb.Client.CodeFirst.InitTables(); } } \ No newline at end of file