tsai
/
abp-next-admin
mirror of https://github.com/colinin/abp-next-admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix(openiddict): Fixed some list query paging errors.

pull/894/head
colin 2 years ago
parent
1b8fa76d37
commit
dcc1574699
3 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationAppService.cs
  2. 10
      aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Tokens/OpenIddictTokenAppService.cs
  3. 2
      aspnet-core/services/LY.MicroService.Applications.Single/Properties/PublishProfiles/FolderProfile1.pubxml.user

6
aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationAppService.cs
View File

@ -57,7 +57,7 @@ public class OpenIddictAuthorizationAppService : OpenIddictApplicationServiceBas
}
if (input.EndCreationTime.HasValue)
{
queryable = queryable.Where(x => x.CreationTime <= input.BeginCreationTime);
queryable = queryable.Where(x => x.CreationTime <= input.EndCreationTime);
}
if (!input.Status.IsNullOrWhiteSpace())
{
@ -78,6 +78,8 @@ public class OpenIddictAuthorizationAppService : OpenIddictApplicationServiceBas
x.Scopes.Contains(input.Filter) || x.Properties.Contains(input.Filter));
}
var totalCount = await AsyncExecuter.CountAsync(queryable);
var sorting = input.Sorting;
if (sorting.IsNullOrWhiteSpace())
{
@ -86,8 +88,6 @@ public class OpenIddictAuthorizationAppService : OpenIddictApplicationServiceBas
queryable = queryable
.OrderBy(sorting)
.PageBy(input.SkipCount, input.MaxResultCount);
var totalCount = await AsyncExecuter.CountAsync(queryable);
var entites = await AsyncExecuter.ToListAsync(queryable);
return new PagedResultDto<OpenIddictAuthorizationDto>(totalCount,

10
aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Tokens/OpenIddictTokenAppService.cs
View File

@ -57,15 +57,15 @@ public class OpenIddictTokenAppService : OpenIddictApplicationServiceBase, IOpen
}
if (input.EndCreationTime.HasValue)
{
queryable = queryable.Where(x => x.CreationTime <= input.BeginCreationTime);
queryable = queryable.Where(x => x.CreationTime <= input.EndCreationTime);
}
if (input.BeginExpirationDate.HasValue)
{
queryable = queryable.Where(x => x.ExpirationDate >= input.BeginCreationTime);
queryable = queryable.Where(x => x.ExpirationDate >= input.BeginExpirationDate);
}
if (input.EndExpirationDate.HasValue)
{
queryable = queryable.Where(x => x.ExpirationDate <= input.BeginCreationTime);
queryable = queryable.Where(x => x.ExpirationDate <= input.EndExpirationDate);
}
if (!input.Status.IsNullOrWhiteSpace())
{
@ -91,6 +91,8 @@ public class OpenIddictTokenAppService : OpenIddictApplicationServiceBase, IOpen
x.ReferenceId.Contains(input.ReferenceId));
}
var totalCount = await AsyncExecuter.CountAsync(queryable);
var sorting = input.Sorting;
if (sorting.IsNullOrWhiteSpace())
{
@ -100,8 +102,6 @@ public class OpenIddictTokenAppService : OpenIddictApplicationServiceBase, IOpen
queryable = queryable
.OrderBy(sorting)
.PageBy(input.SkipCount, input.MaxResultCount);
var totalCount = await AsyncExecuter.CountAsync(queryable);
var entites = await AsyncExecuter.ToListAsync(queryable);
return new PagedResultDto<OpenIddictTokenDto>(totalCount,

2
aspnet-core/services/LY.MicroService.Applications.Single/Properties/PublishProfiles/FolderProfile1.pubxml.user
View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\C Sharp\Open-Sources\abp-next-admin\aspnet-core\services\LY.MicroService.Applications.Single\bin\Release\net7.0\publish\</_PublishTargetUrl>
<History>True|2023-10-27T03:11:20.2834666Z;True|2023-10-27T11:06:21.3079746+08:00;True|2023-10-27T10:48:34.6995829+08:00;True|2023-10-26T10:08:24.4497429+08:00;True|2023-10-26T10:02:10.6238014+08:00;True|2023-10-26T09:48:20.1017009+08:00;True|2023-10-26T09:33:37.3991393+08:00;True|2023-10-25T16:14:51.9658198+08:00;True|2023-10-24T09:18:20.5030667+08:00;True|2023-10-23T17:44:35.6749808+08:00;True|2023-10-18T17:35:46.8173884+08:00;True|2023-10-18T08:20:25.4724000+08:00;True|2023-10-17T20:41:39.8166265+08:00;True|2023-10-17T20:32:05.6551486+08:00;True|2023-10-17T20:29:19.7472269+08:00;True|2023-10-17T18:19:43.6344087+08:00;True|2023-10-17T17:20:20.0797294+08:00;True|2023-10-17T09:00:40.0972772+08:00;True|2023-10-17T08:55:45.9955777+08:00;True|2023-10-17T08:24:44.7012068+08:00;True|2023-10-16T18:10:03.1232748+08:00;True|2023-10-16T17:52:29.6719862+08:00;True|2023-10-16T16:19:59.2730598+08:00;True|2023-10-16T15:43:02.1945039+08:00;True|2023-10-16T08:02:18.1704809+08:00;True|2023-10-14T16:45:12.9838816+08:00;False|2023-10-14T16:43:45.3839438+08:00;True|2023-10-14T15:48:46.0226669+08:00;True|2023-10-14T09:19:00.9482903+08:00;True|2023-10-13T16:17:49.1884589+08:00;False|2023-10-13T16:14:57.9204224+08:00;False|2023-10-13T16:12:31.6792705+08:00;False|2023-10-13T16:09:52.4764354+08:00;True|2023-10-12T11:06:51.5823669+08:00;</History>
<History>True|2023-10-27T03:56:31.4208849Z;True|2023-10-27T11:11:20.2834666+08:00;True|2023-10-27T11:06:21.3079746+08:00;True|2023-10-27T10:48:34.6995829+08:00;True|2023-10-26T10:08:24.4497429+08:00;True|2023-10-26T10:02:10.6238014+08:00;True|2023-10-26T09:48:20.1017009+08:00;True|2023-10-26T09:33:37.3991393+08:00;True|2023-10-25T16:14:51.9658198+08:00;True|2023-10-24T09:18:20.5030667+08:00;True|2023-10-23T17:44:35.6749808+08:00;True|2023-10-18T17:35:46.8173884+08:00;True|2023-10-18T08:20:25.4724000+08:00;True|2023-10-17T20:41:39.8166265+08:00;True|2023-10-17T20:32:05.6551486+08:00;True|2023-10-17T20:29:19.7472269+08:00;True|2023-10-17T18:19:43.6344087+08:00;True|2023-10-17T17:20:20.0797294+08:00;True|2023-10-17T09:00:40.0972772+08:00;True|2023-10-17T08:55:45.9955777+08:00;True|2023-10-17T08:24:44.7012068+08:00;True|2023-10-16T18:10:03.1232748+08:00;True|2023-10-16T17:52:29.6719862+08:00;True|2023-10-16T16:19:59.2730598+08:00;True|2023-10-16T15:43:02.1945039+08:00;True|2023-10-16T08:02:18.1704809+08:00;True|2023-10-14T16:45:12.9838816+08:00;False|2023-10-14T16:43:45.3839438+08:00;True|2023-10-14T15:48:46.0226669+08:00;True|2023-10-14T09:19:00.9482903+08:00;True|2023-10-13T16:17:49.1884589+08:00;False|2023-10-13T16:14:57.9204224+08:00;False|2023-10-13T16:12:31.6792705+08:00;False|2023-10-13T16:09:52.4764354+08:00;True|2023-10-12T11:06:51.5823669+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
Write Preview
Loading…
Cancel
Save