gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、优化更新机构提示 2、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-02-09 02:39:33 +08:00
parent 12ee5a4147
commit 2b5ccf9295
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -20,9 +20,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" /> <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.3" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.5" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.3" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.5" />
<PackageReference Include="Furion.Pure" Version="4.9.7.3" /> <PackageReference Include="Furion.Pure" Version="4.9.7.5" />
<PackageReference Include="Hardware.Info" Version="101.0.0.1" /> <PackageReference Include="Hardware.Info" Version="101.0.0.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />

6
Admin.NET/Admin.NET.Core/Enum/ErrorCodeEnum.cs
View File

@ -295,6 +295,12 @@ public enum ErrorCodeEnum
[ErrorCodeItemMetadata("禁止增加根节点机构")] [ErrorCodeItemMetadata("禁止增加根节点机构")]
D2009, D2009,
/// <summary>
/// 系统默认机构禁止修改
/// </summary>
[ErrorCodeItemMetadata("系统默认机构禁止修改")]
D2010,
/// <summary> /// <summary>
/// 字典类型不存在 /// 字典类型不存在
/// </summary> /// </summary>

2
Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs
View File

@ -158,7 +158,7 @@ public class SysOrgService : IDynamicApiController, ITransient
public async Task UpdateOrg(UpdateOrgInput input) public async Task UpdateOrg(UpdateOrgInput input)
{ {
if (!_userManager.SuperAdmin && input.Pid == 0) if (!_userManager.SuperAdmin && input.Pid == 0)
throw Oops.Oh(ErrorCodeEnum.D2009); throw Oops.Oh(ErrorCodeEnum.D2010);
if (input.Pid != 0) if (input.Pid != 0)
{ {

6
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2025.02.08", "lastBuildTime": "2025.02.09",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -75,7 +75,7 @@
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.3.80", "vxe-pc-ui": "^4.3.80",
"vxe-table": "^4.10.0", "vxe-table": "^4.10.6",
"vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7", "vxe-table-plugin-export-xlsx": "^4.0.7",
"xe-utils": "^3.7.0", "xe-utils": "^3.7.0",
@ -94,7 +94,7 @@
"@vitejs/plugin-vue-jsx": "^4.1.1", "@vitejs/plugin-vue-jsx": "^4.1.1",
"@vue/compiler-sfc": "^3.5.13", "@vue/compiler-sfc": "^3.5.13",
"code-inspector-plugin": "^0.19.2", "code-inspector-plugin": "^0.19.2",
"eslint": "^9.19.0", "eslint": "^9.20.0",
"eslint-plugin-vue": "^9.32.0", "eslint-plugin-vue": "^9.32.0",
"globals": "^15.14.0", "globals": "^15.14.0",
"less": "^4.2.2", "less": "^4.2.2",