Prechádzať zdrojové kódy

调整联表时MergeTable的位置

Signed-off-by: Lzh666 <422235757@qq.com>
Lzh666 1 rok pred
rodič
commit
8afa62cef0

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Config/SysTenantConfigService.cs

@@ -28,7 +28,7 @@ public class SysTenantConfigService : IDynamicApiController, ITransient
         _sysConfigRep = sysConfigRep;
         _sysConfigDataRep = sysConfigDataRep;
         VSysConfig = _sysConfigRep.AsQueryable().LeftJoin(_sysConfigDataRep.AsQueryable().WhereIF(_userManager.SuperAdmin, cv => cv.TenantId == _userManager.TenantId),
-            (c, cv) => c.Id == cv.ConfigId).MergeTable().Select<SysConfig>();
+            (c, cv) => c.Id == cv.ConfigId).Select<SysConfig>().MergeTable();
     }
 
     /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Config/SysUserConfigService.cs

@@ -28,7 +28,7 @@ public class SysUserConfigService : IDynamicApiController, ITransient
         _sysConfigRep = sysConfigRep;
         _sysConfigDataRep = sysConfigDataRep;
         VSysConfig = _sysConfigRep.AsQueryable().LeftJoin(_sysConfigDataRep.AsQueryable().WhereIF(_userManager.SuperAdmin, cv => cv.UserId == _userManager.UserId),
-            (c, cv) => c.Id == cv.ConfigId).MergeTable().Select<SysConfig>();
+            (c, cv) => c.Id == cv.ConfigId).Select<SysConfig>().MergeTable();
     }
 
     /// <summary>