Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -123,15 +123,26 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 else
                 {
-
-                    result = new Result() { Code = 0, Msg = "暂无数据！", Data = _DecreasePayments };
+                    if (dto.PageIndex != 0 && dto.PageSize != 0)
+                    {
+                        ListViewBase<InvitationOfficialActivitiesView> rst = new ListViewBase<InvitationOfficialActivitiesView>();
+                        rst.DataList = _DecreasePayments;
+                        rst.DataCount = _DecreasePayments.Count;
+                        rst.CurrPageIndex = dto.PageIndex;
+                        rst.CurrPageSize = dto.PageSize;
+                        return result = new Result() { Code = 0, Msg = "暂无数据！", Data = rst };
+                    }
+                    else
+                    {
+                        return result = new Result() { Code = 0, Msg = "暂无数据！", Data = _DecreasePayments };
+                    }
+                   
                 }
             }
             catch (Exception ex)
             {
-                result = new Result() { Code = -2, Msg = "未知错误" };
+                return result = new Result() { Code = -2, Msg = "未知错误" };
             }
-            return result;
         }
         /// <summary>
         /// 商邀费用操作（Status:1.新增,2.修改）