From 001f28c4c37d1380096da34e44dc8bbf60c0930f Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 5 Mar 2024 18:32:48 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=BF=94=E5=9B=9EEditable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Organization/Response/GainfoGroupTreeResponse.cs | 5 +++++ .../Organization/Services/Implements/GainfoGroupService.cs | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoGroupTreeResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoGroupTreeResponse.cs index 3fb4ca63..b9219035 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoGroupTreeResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoGroupTreeResponse.cs @@ -23,6 +23,11 @@ public class GainfoGroupTreeResponse /// public string Remark { get; set; } + /// + /// 是否编辑 + /// + public bool Editable { get; set; } + [JsonIgnore] public string TenantId { get; set; } diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs index 2a4390ef..82c91486 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs @@ -22,14 +22,14 @@ public class GainfoGroupService : IGainfoGroupService public async Task> GetTreeAsync() { - var deviceGroups = await _dbContext.Queryable() + var gainfoGroups = await _dbContext.Queryable() .Select() .ToListAsync(); - var tops = deviceGroups.Where(x => !x.PCode.HasValue).ToList(); + var tops = gainfoGroups.Where(x => !x.PCode.HasValue).ToList(); tops.ForEach(x => { - RecursionGetNext(x, deviceGroups); + RecursionGetNext(x, gainfoGroups); }); return tops;