wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-04-21 09:13:57 +08:00
parent 76ca8e4984 13f2b211bb
commit 27806e96a3
32 changed files with 1034 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
system/Tnb.Systems/Common/TestService.cs
View File

@@ -70,6 +70,13 @@ public class TestService : IDynamicApiController, ITransient
}
}
public async Task ImportMoldData()
{
}
public void xx(UserEntity user)
{
user.Account = "2312321";

8
system/Tnb.Systems/Permission/OrganizeService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
using System.Linq.Expressions;
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
@@ -626,9 +627,10 @@ public class OrganizeService : IOrganizeService, IDynamicApiController, ITransie
/// </summary>
/// <returns></returns>
[NonAction]
public async Task<List<OrganizeEntity>> GetListAsync()
public async Task<List<OrganizeEntity>> GetListAsync(Expression<Func<OrganizeEntity, bool>> expression = null)
{
return await _repository.AsQueryable().Where(t => t.EnabledMark == 1 && t.DeleteMark == null).OrderBy(o => o.SortCode).OrderBy(a => a.CreatorTime, OrderByType.Desc).ToListAsync();
var query = _repository.AsQueryable().Where(t => t.EnabledMark == 1 && t.DeleteMark == null).WhereIF(expression!=null, expression);
return await query.OrderBy(o => o.SortCode).OrderBy(a => a.CreatorTime, OrderByType.Desc).ToListAsync();
}
/// <summary>

7
system/Tnb.Systems/System/DictionaryDataService.cs
View File

@@ -1,6 +1,7 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager.Files;
using JNPF.Common.Enums;
using JNPF.Common.Manager;
using JNPF.Common.Security;
using JNPF.DatabaseAccessor;
using JNPF.DependencyInjection;
@@ -46,6 +47,8 @@ public class DictionaryDataService : IDictionaryDataService, IDynamicApiControll
/// </summary>
private readonly IUserManager _userManager;
private readonly ICacheManager _cache;
/// <summary>
/// 初始化一个<see cref="DictionaryDataService"/>类型的新实例.
/// </summary>
@@ -53,12 +56,14 @@ public class DictionaryDataService : IDictionaryDataService, IDynamicApiControll
ISqlSugarRepository<DictionaryDataEntity> repository,
IDictionaryTypeService dictionaryTypeService,
IFileManager fileManager,
IUserManager userManager)
IUserManager userManager,
ICacheManager cache)
{
_repository = repository;
_dictionaryTypeService = dictionaryTypeService;
_fileManager = fileManager;
_userManager = userManager;
_cache = cache;
}
#region GET