1

GxPress/Api/GxPress.Api/AppControllers/CollectionController.cs

@@ -49,7 +49,7 @@ namespace GxPress.Api.AppControllers
         public async Task<PagedList<CollectionListPageResult>> PageList(CollectionPageSearchRequest request)
         {
             request.UserId = _loginContext.AccountId;
-            return await _collectionService. PageListAsync(request);
+            return await _collectionService.PageListAsync(request);
         }
 
         /// <summary>

GxPress/Service/GxPress.Service.Implement/Collection/CollectionService.cs

@@ -8,6 +8,7 @@ using GxPress.Common.Page;
 using GxPress.Common.Tools;
 using GxPress.Entity.Middle;
 using GxPress.Entity.WorkMeeting;
+using GxPress.EnumConst;
 using GxPress.Repository.Interface;
 using GxPress.Repository.Interface.Collection;
 using GxPress.Repository.Interface.Missive;
@@ -427,7 +428,7 @@ namespace GxPress.Service.Implement.Collection
 
             }
             //话题类型
-            if (collectionType == 2)
+            if (collectionType == AllTypeConst.Topic.GetHashCode())
             {
                 var topic = await _topicRepository.GetAsync(collectionDataId);
                 if (topic == null)
@@ -464,7 +465,7 @@ namespace GxPress.Service.Implement.Collection
             }
 
             //收藏
-            if (collectionType == 3)
+            if (collectionType == AllTypeConst.Collect.GetHashCode())
             {
                 var collection = await GetCollectionRecursion(collectionDataId);
                 list = await StructCollectionData(collection.EndCollectionDataId, collection.EndCollectionType, collection.SourceUserId);
@@ -472,7 +473,7 @@ namespace GxPress.Service.Implement.Collection
             }
 
             //笔记
-            if (collectionType == 4 || collectionType == 21)
+            if (collectionType ==  AllTypeConst.Note.GetHashCode() || collectionType == 21)
             {
                 var note = await _noteRepository.GetAsync(collectionDataId);
                 if (note != null)

GxPress/Service/GxPress.Service.Implement/Flow/FlowService.Get.cs

@@ -79,8 +79,12 @@ namespace GxPress.Service.Implement
 
         public async Task<FlowResult> GetFlowResult(int todoId, int userId = 0)
         {
+            var flowId = 0;
             var flowTodeDto = await _flowTodoRepository.GetAsync(todoId);
-            var flowId = flowTodeDto.FlowId;
+            if (flowTodeDto != null)
+                flowId = flowTodeDto.FlowId;
+            else
+                flowId = todoId;
             var flowDto = await GetAsync(flowId);
             var user = await _userRepository.GetAsync(flowDto.UserId);
             var avatarUrl = await _userRepository.GetAvatarUrlAsync(flowDto.UserId);