1

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

@@ -475,8 +475,8 @@ namespace GxPress.Service.Implement.Middle
                 query.WhereLike(nameof(Entity.Middle.Middle.FolderName), $"%{request.KeyWord}%");
             if (request.TypeId == -AllTypeConst.Note.GetHashCode())
                 query.WhereIn(nameof(Entity.Middle.Middle.RoleId), new List<int> { 1, 3 });
-            else
-                query.Where(nameof(Entity.Middle.Middle.RoleId), 2);
+            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)));
             List<MiddleSearchFolderResult> result = new List<MiddleSearchFolderResult>();
             foreach (var item in middles)
@@ -524,8 +524,8 @@ namespace GxPress.Service.Implement.Middle
                 query.WhereLike(nameof(Entity.Middle.Middle.FolderName), $"%{request.KeyWord}%");
             if (request.TypeId == -AllTypeConst.Note.GetHashCode())
                 query.WhereIn(nameof(Entity.Middle.Middle.RoleId), new List<int> { 1, 3 });
-            else
-                query.Where(nameof(Entity.Middle.Middle.RoleId), 2);
+            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();
             foreach (var item in middles)