|
@@ -244,13 +244,19 @@ namespace GxPress.Service.Implement.Note
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
public async Task<PagedList<NotePageListRequest>> NotePageListAsync(NoteSearchPageListRequest request)
|
|
public async Task<PagedList<NotePageListRequest>> NotePageListAsync(NoteSearchPageListRequest request)
|
|
{
|
|
{
|
|
|
|
+ var middle = new Entity.Middle.Middle();
|
|
|
|
+ if (request.FolderId > 0 && middle != null)
|
|
|
|
+ {
|
|
|
|
+ middle = await _middleRepository.GetMiddleAsync(request.FolderId);
|
|
|
|
+ if (request.UserId <= 0)
|
|
|
|
+ request.UserId = middle.UserId;
|
|
|
|
+ }
|
|
var result = await _noteRepository.NotePageListAsync(request);
|
|
var result = await _noteRepository.NotePageListAsync(request);
|
|
result.DraftCount = await _noteRepository.GetDraftCountAsync(request.UserId, request.TypeValue == 1);
|
|
result.DraftCount = await _noteRepository.GetDraftCountAsync(request.UserId, request.TypeValue == 1);
|
|
result.IsDraft = result.DraftCount > 0;
|
|
result.IsDraft = result.DraftCount > 0;
|
|
result.DraftId = await _noteRepository.GetNoteIdByDraftAsync(request.UserId, request.TypeValue == 1);
|
|
result.DraftId = await _noteRepository.GetNoteIdByDraftAsync(request.UserId, request.TypeValue == 1);
|
|
- if (request.FolderId > 0)
|
|
|
|
|
|
+ if (request.FolderId > 0 && middle != null)
|
|
{
|
|
{
|
|
- var middle = await _middleRepository.GetMiddleAsync(request.FolderId);
|
|
|
|
result.RoleId = middle != null ? middle.RoleId : 0;
|
|
result.RoleId = middle != null ? middle.RoleId : 0;
|
|
result.ParentId = middle != null ? middle.ParentId : 0;
|
|
result.ParentId = middle != null ? middle.ParentId : 0;
|
|
}
|
|
}
|