From fa55194727e1bad700585e9449fa7c05cb5b6cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com> Date: Fri, 17 Jan 2025 14:08:37 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=B8=8D=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/BaseApp/AppManager/Request/QueryAppListReq.cs | 4 +++- OpenAuth.App/BaseApp/Base/PageReq.cs | 5 +++-- .../BaseApp/Category/Request/QueryCategoryListReq.cs | 4 +++- .../BaseApp/Category/Request/QueryCategoryTypeListReq.cs | 4 +++- OpenAuth.App/BaseApp/Files/Request/QueryFileListReq.cs | 4 +++- OpenAuth.App/BaseApp/Jobs/Request/QueryOpenJobListReq.cs | 4 +++- .../BaseApp/ModuleManager/Request/QueryElementListReq.cs | 1 + OpenAuth.App/BaseApp/OrgManager/Request/QueryOrgListReq.cs | 1 + .../BaseApp/Permission/Request/BaseDataAuthListReq.cs | 3 ++- OpenAuth.App/BaseApp/Resources/Request/QueryResourcesReq.cs | 4 +++- OpenAuth.App/BaseApp/RoleManager/Request/QueryRoleListReq.cs | 4 +++- OpenAuth.App/BaseApp/SysLogs/Request/QuerySysLogListReq.cs | 4 +++- .../BaseApp/SysMessage/Request/QuerySysMessageListReq.cs | 4 +++- .../BaseApp/SysPosition/Request/QueryPositonListReq.cs | 1 + .../BaseApp/UserManager/Request/QueryUserListByOrgReq.cs | 4 +++- .../BaseApp/UserManager/Request/QueryUserListByRoleReq.cs | 4 +++- OpenAuth.App/BaseApp/UserManager/Request/QueryUserListReq.cs | 4 +++- OpenAuth.App/ServiceApp/GoView/Request/GoViewProjectPage.cs | 3 ++- .../Controllers/BaseControllers/DmModuleController.cs | 1 + .../Controllers/BaseControllers/FormSchemeController.cs | 1 + .../Controllers/BaseControllers/WFDelegateController.cs | 1 + .../Controllers/BaseControllers/WFProcessController.cs | 1 + .../Controllers/BaseControllers/WFSchemeController.cs | 1 + .../Controllers/BaseControllers/WFSchemeInfoController.cs | 1 + .../Controllers/BaseControllers/WFStampController.cs | 1 + .../Controllers/BaseControllers/WFTaskController.cs | 1 + .../ServiceControllers/GoView/GoViewController.cs | 4 ++-- 27 files changed, 56 insertions(+), 18 deletions(-) diff --git a/OpenAuth.App/BaseApp/AppManager/Request/QueryAppListReq.cs b/OpenAuth.App/BaseApp/AppManager/Request/QueryAppListReq.cs index 20081a0..8a59fa4 100644 --- a/OpenAuth.App/BaseApp/AppManager/Request/QueryAppListReq.cs +++ b/OpenAuth.App/BaseApp/AppManager/Request/QueryAppListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QueryAppListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/Base/PageReq.cs b/OpenAuth.App/BaseApp/Base/PageReq.cs index 8fcc1c7..ec5dc50 100644 --- a/OpenAuth.App/BaseApp/Base/PageReq.cs +++ b/OpenAuth.App/BaseApp/Base/PageReq.cs @@ -1,4 +1,4 @@ -namespace OpenAuth.App.Request +namespace OpenAuth.App.BaseApp.Base { public class PageReq { @@ -7,6 +7,7 @@ /// /// 1 public int page { get; set; } + /// /// 每页条数 /// @@ -21,4 +22,4 @@ limit = 10; } } -} +} \ No newline at end of file diff --git a/OpenAuth.App/BaseApp/Category/Request/QueryCategoryListReq.cs b/OpenAuth.App/BaseApp/Category/Request/QueryCategoryListReq.cs index 538e63e..721ab3b 100644 --- a/OpenAuth.App/BaseApp/Category/Request/QueryCategoryListReq.cs +++ b/OpenAuth.App/BaseApp/Category/Request/QueryCategoryListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QueryCategoryListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/Category/Request/QueryCategoryTypeListReq.cs b/OpenAuth.App/BaseApp/Category/Request/QueryCategoryTypeListReq.cs index 1f27d06..6a6f21d 100644 --- a/OpenAuth.App/BaseApp/Category/Request/QueryCategoryTypeListReq.cs +++ b/OpenAuth.App/BaseApp/Category/Request/QueryCategoryTypeListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QueryCategoryTypeListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/Files/Request/QueryFileListReq.cs b/OpenAuth.App/BaseApp/Files/Request/QueryFileListReq.cs index 13d2a2b..bda7baa 100644 --- a/OpenAuth.App/BaseApp/Files/Request/QueryFileListReq.cs +++ b/OpenAuth.App/BaseApp/Files/Request/QueryFileListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + + namespace OpenAuth.App.Request { public class QueryFileListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/Jobs/Request/QueryOpenJobListReq.cs b/OpenAuth.App/BaseApp/Jobs/Request/QueryOpenJobListReq.cs index 0753001..d9f604f 100644 --- a/OpenAuth.App/BaseApp/Jobs/Request/QueryOpenJobListReq.cs +++ b/OpenAuth.App/BaseApp/Jobs/Request/QueryOpenJobListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + + namespace OpenAuth.App.Request { public class QueryOpenJobListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/ModuleManager/Request/QueryElementListReq.cs b/OpenAuth.App/BaseApp/ModuleManager/Request/QueryElementListReq.cs index fb2512e..44af059 100644 --- a/OpenAuth.App/BaseApp/ModuleManager/Request/QueryElementListReq.cs +++ b/OpenAuth.App/BaseApp/ModuleManager/Request/QueryElementListReq.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using OpenAuth.App.BaseApp.Base; namespace OpenAuth.App.ModuleManager { diff --git a/OpenAuth.App/BaseApp/OrgManager/Request/QueryOrgListReq.cs b/OpenAuth.App/BaseApp/OrgManager/Request/QueryOrgListReq.cs index 29895fd..cea5c7d 100644 --- a/OpenAuth.App/BaseApp/OrgManager/Request/QueryOrgListReq.cs +++ b/OpenAuth.App/BaseApp/OrgManager/Request/QueryOrgListReq.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using OpenAuth.App.BaseApp.Base; namespace OpenAuth.App.Request { diff --git a/OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthListReq.cs b/OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthListReq.cs index 1d6ee96..da6236f 100644 --- a/OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthListReq.cs +++ b/OpenAuth.App/BaseApp/Permission/Request/BaseDataAuthListReq.cs @@ -1,4 +1,5 @@ -using OpenAuth.App.Request; +using OpenAuth.App.BaseApp.Base; +using OpenAuth.App.Request; namespace OpenAuth.App.Permission.Request; diff --git a/OpenAuth.App/BaseApp/Resources/Request/QueryResourcesReq.cs b/OpenAuth.App/BaseApp/Resources/Request/QueryResourcesReq.cs index f6c3a9b..7dad27d 100644 --- a/OpenAuth.App/BaseApp/Resources/Request/QueryResourcesReq.cs +++ b/OpenAuth.App/BaseApp/Resources/Request/QueryResourcesReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QueryResourcesReq : PageReq { diff --git a/OpenAuth.App/BaseApp/RoleManager/Request/QueryRoleListReq.cs b/OpenAuth.App/BaseApp/RoleManager/Request/QueryRoleListReq.cs index 75e94fc..57e0b96 100644 --- a/OpenAuth.App/BaseApp/RoleManager/Request/QueryRoleListReq.cs +++ b/OpenAuth.App/BaseApp/RoleManager/Request/QueryRoleListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QueryRoleListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/SysLogs/Request/QuerySysLogListReq.cs b/OpenAuth.App/BaseApp/SysLogs/Request/QuerySysLogListReq.cs index a3fa012..69cce0c 100644 --- a/OpenAuth.App/BaseApp/SysLogs/Request/QuerySysLogListReq.cs +++ b/OpenAuth.App/BaseApp/SysLogs/Request/QuerySysLogListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QuerySysLogListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/SysMessage/Request/QuerySysMessageListReq.cs b/OpenAuth.App/BaseApp/SysMessage/Request/QuerySysMessageListReq.cs index 895c93f..f01bf6d 100644 --- a/OpenAuth.App/BaseApp/SysMessage/Request/QuerySysMessageListReq.cs +++ b/OpenAuth.App/BaseApp/SysMessage/Request/QuerySysMessageListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QuerySysMessageListReq : PageReq { diff --git a/OpenAuth.App/BaseApp/SysPosition/Request/QueryPositonListReq.cs b/OpenAuth.App/BaseApp/SysPosition/Request/QueryPositonListReq.cs index 4a42172..d0f5d50 100644 --- a/OpenAuth.App/BaseApp/SysPosition/Request/QueryPositonListReq.cs +++ b/OpenAuth.App/BaseApp/SysPosition/Request/QueryPositonListReq.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using OpenAuth.App.BaseApp.Base; namespace OpenAuth.App { diff --git a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByOrgReq.cs b/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByOrgReq.cs index 4ced4d5..d516b6c 100644 --- a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByOrgReq.cs +++ b/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByOrgReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QueryUserListByOrgReq : PageReq { diff --git a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByRoleReq.cs b/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByRoleReq.cs index 0cfabc0..19358b3 100644 --- a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByRoleReq.cs +++ b/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListByRoleReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QueryUserListByRoleReq : PageReq { diff --git a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListReq.cs b/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListReq.cs index 88ea0f0..e14d781 100644 --- a/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListReq.cs +++ b/OpenAuth.App/BaseApp/UserManager/Request/QueryUserListReq.cs @@ -1,4 +1,6 @@ -namespace OpenAuth.App.Request +using OpenAuth.App.BaseApp.Base; + +namespace OpenAuth.App.Request { public class QueryUserListReq : PageReq { diff --git a/OpenAuth.App/ServiceApp/GoView/Request/GoViewProjectPage.cs b/OpenAuth.App/ServiceApp/GoView/Request/GoViewProjectPage.cs index 0de8111..fb70a5f 100644 --- a/OpenAuth.App/ServiceApp/GoView/Request/GoViewProjectPage.cs +++ b/OpenAuth.App/ServiceApp/GoView/Request/GoViewProjectPage.cs @@ -1,4 +1,5 @@ -using OpenAuth.App.Request; +using OpenAuth.App.BaseApp.Base; +using OpenAuth.App.Request; namespace OpenAuth.App.ServiceApp.GoView.Request; diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/DmModuleController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/DmModuleController.cs index 08f4d2c..6304975 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/DmModuleController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/DmModuleController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Models; using NetTaste; using OpenAuth.App; +using OpenAuth.App.BaseApp.Base; using OpenAuth.App.BaseApp.DmModuleManager; using OpenAuth.App.BaseApp.DmModuleManager.Request; using OpenAuth.App.BaseApp.DmModuleManager.Response; diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/FormSchemeController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/FormSchemeController.cs index 7233012..d9b847c 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/FormSchemeController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/FormSchemeController.cs @@ -5,6 +5,7 @@ using Infrastructure.Helpers.Excel.Model; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using OpenAuth.App.BaseApp.Base; using OpenAuth.App.FormScheme; using OpenAuth.App.FormScheme.Request; using OpenAuth.App.FormScheme.Response; diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFDelegateController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/WFDelegateController.cs index 094dc68..8a7e2c5 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFDelegateController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/WFDelegateController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using OpenAuth.App; +using OpenAuth.App.BaseApp.Base; using OpenAuth.App.Request; using OpenAuth.Repository.Domain; diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFProcessController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/WFProcessController.cs index 59acb79..684beea 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFProcessController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/WFProcessController.cs @@ -10,6 +10,7 @@ using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; using System.Threading.Tasks; +using OpenAuth.App.BaseApp.Base; using OpenAuth.App.BaseApp.WFTask; namespace OpenAuth.WebApi.Controllers diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeController.cs index d65e206..5142b31 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using OpenAuth.App; +using OpenAuth.App.BaseApp.Base; using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeInfoController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeInfoController.cs index 7d1cfcd..be73096 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeInfoController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/WFSchemeInfoController.cs @@ -6,6 +6,7 @@ using OpenAuth.App.Request; using OpenAuth.App.Response; using OpenAuth.Repository.Domain; using System.Text; +using OpenAuth.App.BaseApp.Base; namespace OpenAuth.WebApi.Controllers { diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFStampController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/WFStampController.cs index 1a410da..a3e0f5e 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFStampController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/WFStampController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using NetTaste; using OpenAuth.App; +using OpenAuth.App.BaseApp.Base; using OpenAuth.App.Request; using OpenAuth.Repository.Domain; diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/WFTaskController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/WFTaskController.cs index f369d0e..ba29dc9 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/WFTaskController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/WFTaskController.cs @@ -7,6 +7,7 @@ using OpenAuth.Repository.Domain; using OpenAuth.App.Interface; using OpenAuth.App.Response; using Microsoft.AspNetCore.Authorization; +using OpenAuth.App.BaseApp.Base; using OpenAuth.App.BaseApp.WFTask; namespace OpenAuth.WebApi.Controllers diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/GoView/GoViewController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/GoView/GoViewController.cs index ae5e5d5..ab63f9c 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/GoView/GoViewController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/GoView/GoViewController.cs @@ -71,9 +71,9 @@ public class GoViewProjectController : ControllerBase /// /// [HttpGet("list")] - public async Task>>> List([FromQuery] GoViewProjectPage page) + public async Task>>> List([FromQuery] GoViewProjectPage req) { - return await _app.List(page); + return await _app.List(req); } ///