1

gx_api/GxPress/Repository/GxPress.Repository.Implement/NoticeRepository.cs

@@ -601,7 +601,10 @@ namespace GxPress.Repository.Implement
         {
             return await _repository.GetAllAsync();
         }
-
+        public async Task<IEnumerable<Notice>> GetAllAsync(Query query)
+        {
+            return await _repository.GetAllAsync(query);
+        }
         public async Task<bool> DeleteAsync(Query query)
         {
             return await _repository.DeleteAsync(query) > 0;

gx_api/GxPress/Repository/GxPress.Repository.Interface/INoticeRepository.cs

@@ -6,6 +6,7 @@ using GxPress.Request.Notice;
 using GxPress.Result.Notice;
 using Datory;
 using GxPress.Result.Job;
+using SqlKata;
 
 namespace GxPress.Repository.Interface
 {
@@ -69,5 +70,6 @@ namespace GxPress.Repository.Interface
         /// <param name="request"></param>
         /// <returns></returns>
         Task<bool> UpdateAsync(SqlKata.Query query);
+        Task<IEnumerable<Notice>> GetAllAsync(Query query);
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/ContentJson/ContentJsonService.cs

@@ -13,6 +13,8 @@ namespace GxPress.Service.Implement.ContentJson
         {
             if (string.IsNullOrWhiteSpace(title))
             {
+                if (string.IsNullOrEmpty(content))
+                    content = "[]";
                 var data = JsonConvert.DeserializeObject<List<ContentJsonData>>(content);
                 if (data.Count > 0)
                 {
@@ -45,6 +47,8 @@ namespace GxPress.Service.Implement.ContentJson
                     }
                 }
             }
+            if (string.IsNullOrEmpty(title))
+                title = string.Empty;
             if (title.Length > 50)
                 title = title.Remove(50, title.Length - 50);
             return title;

gx_api/GxPress/Service/GxPress.Service.Implement/Flow/FlowService.Recall.cs

@@ -2,6 +2,8 @@ using System.Threading.Tasks;
 using Datory;
 using GxPress.EnumConst;
 using System.Transactions;
+using System.Linq;
+
 namespace GxPress.Service.Implement
 {
     public partial class FlowService
@@ -22,21 +24,26 @@ namespace GxPress.Service.Implement
                         throw new Common.Exceptions.BusinessException("非本人操作！");
                     var query = Q.NewQuery();
                     query.Where(nameof(Entity.Notice.SourceId), flowId);
-                    query.Where(nameof(Entity.Notice.TypeValue), AllTypeConst.MySubmitted.GetHashCode());
-                    query.Where(nameof(Entity.Notice.UserId), userId);
-                    var notice = await _noticeRepository.GetAsync(query);
+                    var notices = await _noticeRepository.GetAllAsync(query);
+                    if (notices == null || notices.Count() == 0)
+                        return false;
+                    var notice = notices.FirstOrDefault(n => n.UserId == userId);
                     if (notice == null)
                         return false;
+                    query = Q.NewQuery();
+                    query.Where(nameof(Entity.Notice.Id), notice.Id);
+                    query.Set(nameof(Entity.Notice.IsRecall), true);
+                    await _noticeRepository.UpdateAsync(query);
                     //删除middle
                     query = Q.NewQuery();
                     query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode());
-                    query.Where(nameof(Entity.Middle.Middle.MiddleId), notice.Id);
+                    query.WhereIn(nameof(Entity.Middle.Middle.MiddleId), notices.Select(n => n.Id));
                     query.WhereNot(nameof(Entity.Middle.Middle.UserId), flow.UserId);
                     await middleRepository.DeleteAsync(query);
                     //修改状态
                     query = Q.NewQuery();
                     query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode());
-                    query.Where(nameof(Entity.Middle.Middle.MiddleId), notice.Id);
+                    query.Where(nameof(Entity.Middle.Middle.MiddleId), notices.Select(n => n.Id));
                     query.Where(nameof(Entity.Middle.Middle.UserId), flow.UserId);
                     query.Set(nameof(Entity.Middle.Middle.IsRecall), true);
                     await middleRepository.UpdateAsync(query);