From 83ca39fd9f4e5eda2b24b98da6e63ed733f3a329 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Mon, 22 Sep 2025 12:13:33 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E4=BF=AE=E5=A4=8D=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=A7=9F=E6=88=B7=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs | 2 +- Admin.NET/Admin.NET.sln | 4 ++-- Web/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs index cffbc68a..5fda1a51 100644 --- a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs @@ -119,7 +119,7 @@ public class SysAuthService : IDynamicApiController, ITransient // 判断账号是否存在 var user = await _sysUserRep.AsQueryable().Includes(u => u.SysOrg).ClearFilter() - .WhereIF(tenantId > 0, u => u.TenantId == tenantId) + //.WhereIF(tenantId > 0, u => u.TenantId == tenantId) .WhereIF(!string.IsNullOrWhiteSpace(account), u => u.Account.Equals(account)) .WhereIF(!string.IsNullOrWhiteSpace(phone), u => u.Phone.Equals(phone)) .FirstAsync(); diff --git a/Admin.NET/Admin.NET.sln b/Admin.NET/Admin.NET.sln index a7cc8391..a452e8a4 100644 --- a/Admin.NET/Admin.NET.sln +++ b/Admin.NET/Admin.NET.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.14.36511.14 d17.14 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11012.119 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.NET.Application", "Admin.NET.Application\Admin.NET.Application.csproj", "{C3F5AEC5-ACEE-4109-94E3-3F981DC18268}" EndProject diff --git a/Web/package.json b/Web/package.json index 06145c20..c2c46b78 100644 --- a/Web/package.json +++ b/Web/package.json @@ -82,7 +82,7 @@ "vue-signature-pad": "^3.0.2", "vue3-tree-org": "^4.2.2", "vxe-pc-ui": "^4.9.34", - "vxe-table": "^4.16.16", + "vxe-table": "^4.16.18", "xe-utils": "^3.7.9", "xlsx-js-style": "^1.2.0" },