1

gx_api/GxPress/Service/GxPress.Service.Implement/Middle/MiddleService.cs

@@ -557,17 +557,14 @@ namespace GxPress.Service.Implement.Middle
             var query = Q.NewQuery();
             query.Where(nameof(Entity.Middle.Middle.ParentId), request.ParentId)
                 .Where(nameof(Entity.Middle.Middle.AttributeValue), 2);
-            if (request.TypeId == -AllTypeConst.Note.GetHashCode())
-                query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Note.GetHashCode());
-            else
-                query.Where(nameof(Entity.Middle.Middle.FolderType), request.TypeId);
+            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);
             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())
+            if (request.TypeId == AllTypeConst.TopicNote.GetHashCode())
                 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> { 2 });