|
@@ -516,7 +516,7 @@ namespace GxPress.Service.Implement.Middle
|
|
|
/// <returns></returns>
|
|
|
public async Task<MiddleSearchFolderByParendIsResult> SearchFolderAndParentIdAsync(MiddleSearchFolderRequest request)
|
|
|
{
|
|
|
- var middle = await _middleRepository.GetMiddleAsync(Q.Where(nameof(Entity.Middle.Middle.Id), request.ParentId));
|
|
|
+
|
|
|
var query = Q.NewQuery();
|
|
|
query.Where(nameof(Entity.Middle.Middle.ParentId), request.ParentId)
|
|
|
.Where(nameof(Entity.Middle.Middle.AttributeValue), 2);
|
|
@@ -534,11 +534,14 @@ namespace GxPress.Service.Implement.Middle
|
|
|
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.IsTop), nameof(Entity.Middle.Middle.Sort), nameof(Entity.Middle.Middle.LastModifiedDate)));
|
|
|
- var result = new MiddleSearchFolderByParendIsResult()
|
|
|
+ var middle = await _middleRepository.GetMiddleAsync(Q.Where(nameof(Entity.Middle.Middle.Id), request.ParentId));
|
|
|
+ var result = new MiddleSearchFolderByParendIsResult();
|
|
|
+ if (middle != null && middle.ParentId > 0)
|
|
|
{
|
|
|
- Id = middle == null ? 0 : middle.Id,
|
|
|
- Name = middle == null ? "" : middle.FolderName
|
|
|
- };
|
|
|
+ middle = await _middleRepository.GetMiddleAsync(Q.Where(nameof(Entity.Middle.Middle.Id), middle.ParentId));
|
|
|
+ result.Id = middle == null ? 0 : middle.Id;
|
|
|
+ result.Name = middle == null ? "" : middle.FolderName;
|
|
|
+ }
|
|
|
result.Item = new List<MiddleSearchFolderResult>();
|
|
|
foreach (var item in middles)
|
|
|
{
|