|
@@ -548,7 +548,7 @@ namespace GxPress.Service.Implement.Middle
|
|
|
query.WhereIn(nameof(Entity.Middle.Middle.RoleId), new List<int> { 1, 3 });
|
|
|
if (request.TypeId == AllTypeConst.Note.GetHashCode())
|
|
|
query.WhereIn(nameof(Entity.Middle.Middle.RoleId), new List<int> { 1 });
|
|
|
- var middles = await _middleRepository.FindAsync(query.OrderByDesc(nameof(Entity.Middle.Middle.IsSystemDefault),nameof(Entity.Middle.Middle.IsTop), nameof(Entity.Middle.Middle.Sort), nameof(Entity.Middle.Middle.LastModifiedDate)));
|
|
|
+ var middles = await _middleRepository.FindAsync(query.OrderByDesc(nameof(Entity.Middle.Middle.IsSystemDefault), nameof(Entity.Middle.Middle.IsTop), nameof(Entity.Middle.Middle.Sort), nameof(Entity.Middle.Middle.LastModifiedDate)));
|
|
|
List<MiddleSearchFolderResult> result = new List<MiddleSearchFolderResult>();
|
|
|
foreach (var item in middles)
|
|
|
{
|
|
@@ -559,7 +559,8 @@ namespace GxPress.Service.Implement.Middle
|
|
|
IsDisable = request.FolderIds.Any(n => n.Equals(item.Id)),
|
|
|
RoleId = item.RoleId,
|
|
|
IsFolder = await _middleRepository.IsFolderAsync(item.Id),
|
|
|
- IsTop = item.IsTop
|
|
|
+ IsTop = item.IsTop,
|
|
|
+ IsSystemDefault = item.IsSystemDefault
|
|
|
};
|
|
|
if (item.RoleId == 3)
|
|
|
{
|