|
@@ -543,7 +543,9 @@ namespace GxPress.Service.Implement.Middle
|
|
|
else
|
|
|
query.Where(nameof(Entity.Middle.Middle.FolderType), request.TypeId);
|
|
|
query.Where(nameof(Entity.Middle.Middle.UserId), request.UserId)
|
|
|
- .Where(nameof(Entity.Middle.Middle.IsDelete), false).WhereNotIn(nameof(Entity.Middle.Middle.Id), request.FolderIds);
|
|
|
+ .Where(nameof(Entity.Middle.Middle.IsDelete), false);
|
|
|
+ if (request.FolderIds != null && request.FolderIds.Count > 0)
|
|
|
+ query.WhereNotIn(nameof(Entity.Middle.Middle.Id), request.FolderIds);
|
|
|
if (!string.IsNullOrWhiteSpace(request.KeyWord))
|
|
|
query.WhereLike(nameof(Entity.Middle.Middle.FolderName), $"%{request.KeyWord}%");
|
|
|
if (request.TypeId == -AllTypeConst.Note.GetHashCode())
|