1

gx_api/GxPress/Model/GxPress.Result/App/Note/NotePageListRequest.cs

@@ -48,6 +48,10 @@ namespace GxPress.Result.App.Note
         /// 创建时间
         /// </summary>
         public DateTime? CreatedDate { get; set; }
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? LastModifiedDate { get; set; }
 
         /// <summary>
         /// 是否点赞

gx_api/GxPress/Repository/GxPress.Repository.Implement/Note/NoteRepository.cs

@@ -177,7 +177,7 @@ namespace GxPress.Repository.Implement.Note
                     sqlStr = "a.ParentId";
                 sql =
                    $@"SELECT  a.Id,a.MiddleId,a.RoleId,a.ParentId,a.AttributeValue,a.UserId,
-                    a.CreatedDate,a.IsTop,a.FolderName,a.FolderType,
+                    a.CreatedDate,a.LastModifiedDate,a.IsTop,a.FolderName,a.FolderType,
                     (SELECT GROUP_CONCAT(SourceName Separator'、') from tede_user_middle where MiddleType={noteTypeId} 
                     and DataSourceId=a.MiddleSonId) as EnjoyUser,
                     (SELECT 
@@ -315,7 +315,7 @@ namespace GxPress.Repository.Implement.Note
             {
                 sql =
                     $@"SELECT  a.Id,a.MiddleId,a.RoleId,a.ParentId,a.AttributeValue,a.UserId,
-                      a.CreatedDate,a.IsTop,a.FolderName,a.FolderType,
+                      a.CreatedDate,a.LastModifiedDate,a.IsTop,a.FolderName,a.FolderType,
                     (SELECT GROUP_CONCAT(SourceName Separator'、') from tede_user_middle where MiddleType={noteTypeId} 
                     and DataSourceId=a.MiddleSonId) as EnjoyUser,
                     (SELECT 

gx_api/GxPress/Repository/GxPress.Repository.Implement/RecordFolder/RecordFolderRepository.cs

@@ -93,7 +93,7 @@ namespace GxPress.Repository.Implement.RecordFolder
             }
             //修改
             recordFolder.FolderId = folderId;
-            recordFolder.FolderName = middle.FolderName;
+            recordFolder.FolderName =middle==null?"根目录":middle.FolderName;
             return await _repository.UpdateAsync(recordFolder);
         }
 

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

@@ -389,6 +389,14 @@ namespace GxPress.Service.Implement.Middle
                             if (analyze != null)
                                 await _analyzeRepository.DeleteAsync(analyze.Id);
                         }
+                          //删除收藏会议纪要
+                        if (item.CollectionType == AllTypeConst.MeetingSummary.GetHashCode())
+                        {
+                            analyzeRequest.TypeValue = item.CollectionType;
+                            var analyze = await analyzeService.GetAnalyzeAsync(analyzeRequest);
+                            if (analyze != null)
+                                await _analyzeRepository.DeleteAsync(analyze.Id);
+                        }
                         //收藏笔记文件夹
                         if (item.CollectionType == AllTypeConst.NoteFolder.GetHashCode() || item.CollectionType == AllTypeConst.CollectFolder.GetHashCode())
                         {

gx_api/GxPress/Service/GxPress.Service.Implement/Note/NoteService.cs

@@ -158,7 +158,7 @@ namespace GxPress.Service.Implement.Note
                     var middle = await _middleRepository.GetMiddleAsync(request.FolderId);
                     result.Id = noteId;
                     result.FolderId = request.FolderId;
-                    result.FolderName = middle == null ? "" : middle.FolderName;
+                    result.FolderName = middle == null ? "根目录" : middle.FolderName;
                     transactionScope.Complete();
                 }
             }

gx_api/GxPress/Service/GxPress.Service.Implement/Notice/NoticeService.cs

@@ -398,7 +398,8 @@ namespace GxPress.Service.Implement.Notice
                 if (request.SearchType == 0)
                     query.Where("tede_middle.ParentId", request.NoticeFolderId);
             }
-            query.Where("tede_middle.IsRecall", false);
+            if (request.SearchType > 0)
+                query.Where("tede_middle.IsRecall", false);
             query.Where("tede_middle.UserId", request.UserId);
             query.Where("tede_middle.FolderType", noticeTypeValue);
             //条数