😎1、修复时间值空时序列化问题 2、过滤租户数据库(相同的类型和链接字符串)
This commit is contained in:
parent
e5b6cc2fba
commit
598da62aa4
@ -482,7 +482,7 @@ public class SysTenantService : IDynamicApiController, ITransient
|
||||
{
|
||||
var tenantDbList = await _sysTenantRep.AsQueryable().ClearFilter()
|
||||
.LeftJoin<SysOrg>((u, a) => u.OrgId == a.Id)
|
||||
//.GroupBy(u => new { u.DbType, u.Connection })
|
||||
.GroupBy(u => new { u.DbType, u.Connection })
|
||||
.Where(u => u.Status == StatusEnum.Enable)
|
||||
.OrderBy(u => u.ConfigId)
|
||||
.Select((u, a) => new DbOutput()
|
||||
|
||||
@ -148,7 +148,8 @@ public class Startup : AppStartup
|
||||
static void SetNewtonsoftJsonSetting(JsonSerializerSettings setting)
|
||||
{
|
||||
//setting.ContractResolver = new DefaultContractResolver(); // 序列化属性名大写(属性原样输出)
|
||||
setting.Converters.AddDateTimeTypeConverters("yyyy-MM-dd HH:mm:ss", localized: true); // 时间格式化
|
||||
setting.DateFormatString = "yyyy-MM-dd HH:mm:ss"; // 时间格式化
|
||||
//setting.Converters.AddDateTimeTypeConverters("yyyy-MM-dd HH:mm:ss", localized: true); // 时间格式化
|
||||
setting.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; // 忽略循环引用
|
||||
//setting.NullValueHandling = NullValueHandling.Ignore; // 忽略所有 null 属性
|
||||
//setting.DefaultValueHandling = DefaultValueHandling.Ignore; // 忽略所有默认值属性
|
||||
|
||||
@ -82,8 +82,8 @@
|
||||
"vue-router": "^4.5.1",
|
||||
"vue-signature-pad": "^3.0.2",
|
||||
"vue3-tree-org": "^4.2.2",
|
||||
"vxe-pc-ui": "^4.8.2",
|
||||
"vxe-table": "^4.14.8",
|
||||
"vxe-pc-ui": "^4.8.3",
|
||||
"vxe-table": "^4.15.0",
|
||||
"xe-utils": "^3.7.8",
|
||||
"xlsx-js-style": "^1.2.0"
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user