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;