1

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

@@ -337,10 +337,10 @@ namespace GxPress.Service.Implement.Notice
             var result = await _noticeRepository.GetNoticeListPageAsync(request);
             foreach (var item in result.Items)
             {
-                if (item.TypeValue > 0)
+                if (item.TypeValue >= 15)
                 {
-                    item.TodoId=item.SonId;
-                    item.MiddleId=item.SourceId;
+                    item.TodoId = item.SonId;
+                    item.MiddleId = item.SourceId;
                     //item.UserName = item.SendUserName;
                     item.ReadCount = item.CheckedCount;
                     item.UReadCount = item.UCheckedCount;
@@ -354,33 +354,33 @@ namespace GxPress.Service.Implement.Notice
                     //我审批
                     if (item.TypeValue == AllTypeConst.MyChecked.GetHashCode())
                         item.IsRead = item.IsFlowChecked;
-                }
-                if (item.IsDone && item.IsChecked)
-                    item.FlowState = FlowState.Checked;
-                else if (item.IsDone && !item.IsChecked)
-                {
-                    if (item.DoneType == 1)
-                        item.FlowState = FlowState.Meeting;
-                    else if (item.DoneType == 2)
-                        item.FlowState = FlowState.Wait;
-                    else
+
+                    if (item.IsDone && item.IsChecked)
+                        item.FlowState = FlowState.Checked;
+                    else if (item.IsDone && !item.IsChecked)
+                    {
+                        if (item.DoneType == 1)
+                            item.FlowState = FlowState.Meeting;
+                        else if (item.DoneType == 2)
+                            item.FlowState = FlowState.Wait;
+                        else
+                            item.FlowState = FlowState.Denied;
+                    }
+                    else if (item.IsDone && !item.IsChecked)
                         item.FlowState = FlowState.Denied;
+                    else
+                    {
+                        item.FlowState = FlowState.Checking;
+                    }
+                    item.Title = _contentJsonService.GetTitile(item.Title, item.Content);
+                    if (item.IsDelete == true)
+                        item.NoticeStatus = 0;
+                    else if (item.NoticeAddresseeType == NoticeTypeConst.Draft)
+                        item.NoticeStatus = 2;
+                    else
+                        item.NoticeStatus = 1;
                 }
-                else if (item.IsDone && !item.IsChecked)
-                    item.FlowState = FlowState.Denied;
-                else
-                {
-                    item.FlowState = FlowState.Checking;
-                }
-                item.Title = _contentJsonService.GetTitile(item.Title, item.Content);
-                if (item.IsDelete == true)
-                    item.NoticeStatus = 0;
-                else if (item.NoticeAddresseeType == NoticeTypeConst.Draft)
-                    item.NoticeStatus = 2;
-                else
-                    item.NoticeStatus = 1;
             }
-
             return result;
         }
         /// <summary>