From 5d5bd6e27f8e85d12ce0a0970644f2b427bc7480 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Mon, 4 Nov 2024 10:42:12 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E4=BB=A3=E7=A0=81=E6=B8=85?= =?UTF-8?q?=E7=90=86=E4=B8=8E=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj | 2 +- Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs | 3 +-- Web/package.json | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 42b2d01b..d8173c61 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -45,7 +45,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs index 0dc45b4c..8e626f35 100644 --- a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs +++ b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs @@ -60,8 +60,7 @@ public static class SqlSugarFilter if (orgIds == null || orgIds.Count == 0) return; // 获取业务实体数据表 - var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass - && u.IsSubclassOf(typeof(EntityBaseData))); + var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsSubclassOf(typeof(EntityBaseData))); if (!entityTypes.Any()) return; orgFilter = new ConcurrentDictionary(); diff --git a/Web/package.json b/Web/package.json index 82fa02dc..5005df5c 100644 --- a/Web/package.json +++ b/Web/package.json @@ -2,7 +2,7 @@ "name": "admin.net.pro", "type": "module", "version": "2.4.33", - "lastBuildTime": "2024.11.03", + "lastBuildTime": "2024.11.04", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "author": "zuohuaijun", "license": "MIT", @@ -48,7 +48,7 @@ "mqtt": "^5.10.1", "nprogress": "^0.2.0", "ol": "^10.2.1", - "pinia": "^2.2.5", + "pinia": "^2.2.6", "print-js": "^1.6.0", "push.js": "^1.0.12", "qrcodejs2-fixes": "^0.0.2", @@ -71,7 +71,7 @@ "vue-router": "^4.4.5", "vue-signature-pad": "^3.0.2", "vue3-tree-org": "^4.2.2", - "vxe-pc-ui": "^4.2.37", + "vxe-pc-ui": "^4.2.38", "vxe-table": "^4.7.59", "vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-export-xlsx": "^4.0.7",