lihao 4 年之前
父节点
当前提交
f3471117ba

+ 1 - 0
gx_api/GxPress/Repository/GxPress.Repository.Implement/UserRepository.cs

@@ -869,6 +869,7 @@ namespace GxPress.Repository.Implement
             string sql = $@"SELECT 
             string sql = $@"SELECT 
                                 COUNT(1)
                                 COUNT(1)
                             FROM
                             FROM
+                            
                                 tede_middle a
                                 tede_middle a
                                     INNER JOIN
                                     INNER JOIN
                                 tede_notice b ON a.MiddleId = b.Id
                                 tede_notice b ON a.MiddleId = b.Id

+ 7 - 4
gx_api/GxPress/Service/GxPress.Service.Implement/Collection/CollectionService.cs

@@ -53,7 +53,10 @@ namespace GxPress.Service.Implement.Collection
             IArticleRepository articleRepository, ITopicRepository topicRepository, IMiddleRepository middleRepository,
             IArticleRepository articleRepository, ITopicRepository topicRepository, IMiddleRepository middleRepository,
             INoteRepository noteRepository, IUserRepository userRepository, IArticleService articleService, INoticeRepository noticeRepository,
             INoteRepository noteRepository, IUserRepository userRepository, IArticleService articleService, INoticeRepository noticeRepository,
             IMissiveRepository missiveRepository, IMapper mapper,
             IMissiveRepository missiveRepository, IMapper mapper,
-            IGroupRepository groupRepository, IMeetingSummaryRepository meetingSummaryRepository, IFolderUserRepository folderUserRepository, IAnalyzeService analyzeService, IFileLibraryRepository fileLibraryRepository, IUserMiddleService userMiddleService, IMediaRepository mediaRepository, IMeetingRepository meetingRepository)
+            IGroupRepository groupRepository, IMeetingSummaryRepository meetingSummaryRepository, 
+            IFolderUserRepository folderUserRepository, 
+            IAnalyzeService analyzeService, 
+            IFileLibraryRepository fileLibraryRepository, IUserMiddleService userMiddleService, IMediaRepository mediaRepository, IMeetingRepository meetingRepository)
         {
         {
             _collectionRepository = collectionRepository;
             _collectionRepository = collectionRepository;
             _middleService = middleService;
             _middleService = middleService;
@@ -653,8 +656,8 @@ namespace GxPress.Service.Implement.Collection
             }
             }
             //工作流
             //工作流
 
 
-            //300 文件
-            if (collectionType == GxPress.EnumConst.AllTypeConst.Flow.GetHashCode())
+            // 文件
+            if (collectionType == GxPress.EnumConst.AllTypeConst.File.GetHashCode())
             {
             {
                 var fileLibrary = await fileLibraryRepository.GetFileLibraryByIdAsync(collectionDataId);
                 var fileLibrary = await fileLibraryRepository.GetFileLibraryByIdAsync(collectionDataId);
                 if (fileLibrary == null)
                 if (fileLibrary == null)
@@ -677,7 +680,7 @@ namespace GxPress.Service.Implement.Collection
                     FileSize = fileLibrary.Size
                     FileSize = fileLibrary.Size
                 };
                 };
             }
             }
-            //400 会议纪要
+            // 会议纪要
             if (collectionType == GxPress.EnumConst.AllTypeConst.MeetingSummary.GetHashCode())
             if (collectionType == GxPress.EnumConst.AllTypeConst.MeetingSummary.GetHashCode())
             {
             {
                 var meetingSummary = await _meetingSummaryRepository.GetAsync(collectionDataId);
                 var meetingSummary = await _meetingSummaryRepository.GetAsync(collectionDataId);

+ 1 - 1
gx_api/GxPress/Service/GxPress.Service.Implement/FileLibrary/FileLibraryService.cs

@@ -28,7 +28,7 @@ namespace GxPress.Service.Implement.FileLibrary
             {
             {
                 var collectionInRequest = new CollectionInRequest();
                 var collectionInRequest = new CollectionInRequest();
                 //记录收藏
                 //记录收藏
-                collectionInRequest.CollectionType = 300;
+                collectionInRequest.CollectionType = GxPress.EnumConst.AllTypeConst.File.GetHashCode();
                 collectionInRequest.CollectionDataId = fileLibraryId;
                 collectionInRequest.CollectionDataId = fileLibraryId;
                 collectionInRequest.UserId = request.UserId;
                 collectionInRequest.UserId = request.UserId;
                 await collectionService.Insert(collectionInRequest);
                 await collectionService.Insert(collectionInRequest);