From 920da7d91811748d0b6d1173a121d5a9c716440e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BD=A0=E4=B8=AA=E6=97=BA=E5=91=80?= Date: Tue, 21 Jan 2025 10:35:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=F0=9F=98=80=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A7=E7=89=88=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E8=A1=A8=E7=BB=93=E6=9E=84=E6=8A=A5Captcha=E3=80=81Se?= =?UTF-8?q?condVer=E5=AD=97=E6=AE=B5=E4=B8=8D=E8=83=BD=E4=B8=BAnull?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Entity/SysTenant.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Entity/SysTenant.cs b/Admin.NET/Admin.NET.Core/Entity/SysTenant.cs index 45422726..9176987a 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysTenant.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysTenant.cs @@ -170,12 +170,12 @@ public partial class SysTenant : EntityBase /// /// 图形验证码 /// - [SugarColumn(ColumnDescription = "图形验证码")] + [SugarColumn(ColumnDescription = "图形验证码", DefaultValue = "1")] public virtual bool Captcha { get; set; } = true; /// /// 登录二次验证 /// - [SugarColumn(ColumnDescription = "登录二次验证")] + [SugarColumn(ColumnDescription = "登录二次验证", DefaultValue = "0")] public virtual bool SecondVer { get; set; } = false; } \ No newline at end of file From b8d1172719f23e52c5dd5292e41124a40cbeb3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BD=A0=E4=B8=AA=E6=97=BA=E5=91=80?= Date: Tue, 21 Jan 2025 11:05:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=98=80=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=9D=9E=E9=BB=98=E8=AE=A4=E7=A7=9F=E6=88=B7=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=85=AC=E5=85=B1=E5=AD=97=E5=85=B8=E5=80=BC?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs | 6 +++--- Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs b/Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs index 68978974..87977de6 100644 --- a/Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs @@ -158,7 +158,7 @@ public class SysDictDataService : IDynamicApiController, ITransient { dictDataList = await _sysDictDataRep.AsQueryable().ClearFilter() .InnerJoin((u, a) => u.DictTypeId == a.Id) - .Where((u, a) => a.SysFlag == YesNoEnum.Y || u.TenantId == _userManager.TenantId) + .Where((u, a) => a.SysFlag == YesNoEnum.Y && u.TenantId == SqlSugarConst.DefaultTenantId || (a.SysFlag == YesNoEnum.N && u.TenantId == _userManager.TenantId)) .Where(u => u.DictTypeId == dictTypeId).OrderBy(u => new { u.OrderNo, u.Code }).ToListAsync(); _sysCacheService.Set($"{CacheConst.KeyDict}{dictType.Code}", dictDataList); } @@ -178,7 +178,7 @@ public class SysDictDataService : IDynamicApiController, ITransient { dictDataList = await _sysDictDataRep.Change().AsQueryable() .LeftJoin((u, a) => u.Id == a.DictTypeId).ClearFilter() - .Where((u, a) => u.SysFlag == YesNoEnum.Y || a.TenantId == _userManager.TenantId) + .Where((u, a) => u.SysFlag == YesNoEnum.Y && a.TenantId == SqlSugarConst.DefaultTenantId || (u.SysFlag == YesNoEnum.N && a.TenantId == _userManager.TenantId)) .Where((u, a) => u.Code == code && u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable) .OrderBy((u, a) => new { a.OrderNo, a.Code }) .Select((u, a) => a).ToListAsync(); @@ -197,7 +197,7 @@ public class SysDictDataService : IDynamicApiController, ITransient { return await _sysDictDataRep.Change().AsQueryable() .LeftJoin((u, a) => u.Id == a.DictTypeId).ClearFilter() - .Where((u, a) => u.SysFlag == YesNoEnum.Y || a.TenantId == _userManager.TenantId) + .Where((u, a) => u.SysFlag == YesNoEnum.Y && a.TenantId == SqlSugarConst.DefaultTenantId || (u.SysFlag == YesNoEnum.N && a.TenantId == _userManager.TenantId)) .Where((u, a) => u.Code == input.Code) .WhereIF(input.Status.HasValue, (u, a) => u.Status == (StatusEnum)input.Status.Value && a.Status == (StatusEnum)input.Status.Value) .OrderBy((u, a) => new { a.OrderNo, a.Code }) diff --git a/Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs b/Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs index b08d6015..9ad6b4dd 100644 --- a/Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs @@ -162,7 +162,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient { var ds = await _sysDictTypeRep.AsQueryable() .InnerJoin((u, a) => u.Id == a.DictTypeId).ClearFilter() - .Where((u, a) => u.SysFlag == YesNoEnum.Y || a.TenantId == _userManager.TenantId) + .Where((u, a) => u.SysFlag == YesNoEnum.Y && a.TenantId == SqlSugarConst.DefaultTenantId || (u.SysFlag == YesNoEnum.N && a.TenantId == _userManager.TenantId)) .Where((u, a) => u.IsDelete == false && a.IsDelete == false && u.Status == StatusEnum.Enable && a.Status == StatusEnum.Enable) .Select((u, a) => new { TypeCode = u.Code, a.Code, a.Name, a.Value, a.Remark, a.OrderNo, a.TagType, a.ExtData }) .ToListAsync();