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

部门接口加上扩展属性

Browse Source
This commit is contained in:
潘飞
2023-04-23 16:43:22 +08:00
parent db3aca5590
commit 3657f83184
7 changed files with 994 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/Tnb.Systems/System/DataBaseService.cs
View File

@@ -95,7 +95,10 @@ public class DataBaseService : IDynamicApiController, ITransient
//tables = tables.Where((x, i) => tables.FindIndex(z => z.Name == x.Name) == i).ToList();
//var output = tables.Adapt<List<DatabaseTableListOutput>>();
if (!string.IsNullOrEmpty(input.keyword))
tables = tables.FindAll(d => d.table.ToLower().Contains(input.keyword.ToLower()) || (d.tableName.IsNotEmptyOrNull() && d.tableName.ToLower().Contains(input.keyword.ToLower())));
{
var keyword = input.keyword.ToLower();
tables = tables.FindAll(d => d.table.ToLower().Contains(keyword) || (d.tableName.IsNotEmptyOrNull() && d.tableName.ToLower().Contains(keyword)));
}
if (tenantLink.DbType.ToLower().Equals("dm"))
{
GetTableCount(tables, tenantLink);

2
system/Tnb.Systems/System/DbLinkService.cs
View File

@@ -318,7 +318,7 @@ public class DbLinkService : IDbLinkService, IDynamicApiController, ITransient
[NonAction]
public async Task<DbLinkEntity> GetInfo(string id)
{
return await _repository.AsSugarClient().CopyNew().Queryable<DbLinkEntity>().FirstAsync(m => m.Id == id && m.DeleteMark == null);
return await _repository.AsSugarClient().Queryable<DbLinkEntity>().FirstAsync(m => m.Id == id && m.DeleteMark == null);
}
#endregion
}