1

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

@@ -523,16 +523,11 @@ namespace GxPress.Service.Implement.Middle
         /// <returns></returns>
         public async Task<bool> RecoverAllAsync(int folderType, int userId)
         {
-            var typeValues = new List<int>(){
-                AllTypeConst.Notice.GetHashCode(),
-                AllTypeConst.Missive.GetHashCode(),
-                AllTypeConst.Flow.GetHashCode(),
-                AllTypeConst.MyChecked.GetHashCode(),
-                AllTypeConst.MySubmitted.GetHashCode(),
-                AllTypeConst.MyCc.GetHashCode()
-            };
-            return await _middleRepository.UpdateAsync(Q.Set(nameof(Entity.Middle.Middle.IsDelete), false).WhereIn(nameof(Entity.Middle.Middle.FolderType), typeValues).Where(nameof(Entity.Middle.Middle.UserId), userId));
-
+            var query = Q.NewQuery();
+            query.Set(nameof(Entity.Middle.Middle.IsDelete), false);
+            query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode());
+            query.Where(nameof(Entity.Middle.Middle.UserId), userId);
+            return await _middleRepository.UpdateAsync(query);
         }
         /// <summary>
         /// 修改文件夹名称
@@ -1013,16 +1008,8 @@ namespace GxPress.Service.Implement.Middle
         /// <returns></returns>
         public async Task<bool> DeleteAllAsync(int folderType, int userId)
         {
-            var typeValues = new List<int>(){
-                AllTypeConst.Notice.GetHashCode(),
-                AllTypeConst.Missive.GetHashCode(),
-                AllTypeConst.Flow.GetHashCode(),
-                AllTypeConst.MyChecked.GetHashCode(),
-                AllTypeConst.MySubmitted.GetHashCode(),
-                AllTypeConst.MyCc.GetHashCode()
-            };
             var query = Q.NewQuery();
-            query.WhereIn(nameof(Entity.Middle.Middle.FolderType), typeValues);
+            query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode());
             query.Where(nameof(Entity.Middle.Middle.UserId), userId);
             query.Where(nameof(Entity.Middle.Middle.IsDelete), true);
             return await _middleRepository.DeleteAsync(query);