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
     /// <summary>
     /// 图形验证码
     /// </summary>
-    [SugarColumn(ColumnDescription = "图形验证码")]
+    [SugarColumn(ColumnDescription = "图形验证码", DefaultValue = "1")]
     public virtual bool Captcha { get; set; } = true;
 
     /// <summary>
     /// 登录二次验证
     /// </summary>
-    [SugarColumn(ColumnDescription = "登录二次验证")]
+    [SugarColumn(ColumnDescription = "登录二次验证", DefaultValue = "0")]
     public virtual bool SecondVer { get; set; } = false;
 }
\ No newline at end of file
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<SysDictType>((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<SysDictType>().AsQueryable()
                 .LeftJoin<SysDictData>((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<SysDictType>().AsQueryable()
             .LeftJoin<SysDictData>((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<SysDictData>((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();