QueryOfficialActivitiesByDiId Api修改

OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -2,6 +2,7 @@
 using MathNet.Numerics.Distributions;
 using MathNet.Numerics.Statistics.Mcmc;
 using Newtonsoft.Json;
+using NPOI.SS.Formula.Functions;
 using OASystem.Domain;
 using OASystem.Domain.Dtos.Resource;
 using OASystem.Domain.Entities.Groups;
@@ -112,10 +113,19 @@ ORDER BY
                     result = new JsonView() { Code = 200, Msg = "查询成功！", Data = rst };
                 }
             }
-            //else
-            //{
-            //    result = new JsonView() { Code = StatusCodes.Status204NoContent, Msg = "暂无数据！", Data = OfficialActivities };
-            //}
+            else
+            {
+                result = new JsonView() { Code = StatusCodes.Status200OK, Msg = "暂无数据！" };
+                if (dto.PageSize == 0 && dto.PageIndex == 0) { result.Data = OfficialActivities; }
+                else {
+                    ListViewBase<OfficialActivitiesView> rst = new ListViewBase<OfficialActivitiesView>();
+                    rst.DataList = OfficialActivities;
+                    rst.DataCount = 0;
+                    rst.CurrPageIndex = dto.PageIndex;
+                    rst.CurrPageSize = dto.PageSize;
+                    result.Data = rst;
+                }
+            }
 
             return result;
         }