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

😎1、调整职位和角色默认菜单种子 2、新增账号默认职位 3、默认放开组织机构、角色、职位列表接口 4、升级最新依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-07-01 01:45:43 +08:00
parent 90c51101ac
commit 2b72db886e
8 changed files with 45 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,9 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.7" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.90" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.90" />
<PackageReference Include="Furion.Pure" Version="4.9.7.90" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.91" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.91" />
<PackageReference Include="Furion.Pure" Version="4.9.7.91" />
<PackageReference Include="Hardware.Info" Version="101.0.1.1" />
<PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" />
@ -52,7 +52,7 @@
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.5" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.10.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.12.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.196" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.197" />
<PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.6" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />

1
Admin.NET/Admin.NET.Core/Entity/SysReportConfig.cs
View File

@ -37,6 +37,7 @@ public class SysReportConfig : EntityBase
/// 数据源
/// </summary>
[SugarColumn(ColumnDescription = "数据源", Length = 64)]
[MaxLength(64)]
public string? DataSource { get; set; }
/// <summary>

2
Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs
View File

@ -59,7 +59,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
new SysMenu{ Id=1310000000151, Pid=1310000000101, Title="职位管理", Path="/system/pos", Name="sysPos", Component="/system/pos/index",Icon="ele-Mug", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
new SysMenu{ Id=1310000000152, Pid=1310000000151, Title="查询", Permission="sysPos/page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
new SysMenu{ Id=1310000000153, Pid=1310000000151, Title="列表", Permission="sysPos/list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
//new SysMenu{ Id=1310000000153, Pid=1310000000151, Title="列表", Permission="sysPos/list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
new SysMenu{ Id=1310000000154, Pid=1310000000151, Title="编辑", Permission="sysPos/update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
new SysMenu{ Id=1310000000155, Pid=1310000000151, Title="增加", Permission="sysPos/add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
new SysMenu{ Id=1310000000156, Pid=1310000000151, Title="删除", Permission="sysPos/delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },

21
Admin.NET/Admin.NET.Core/SeedData/SysPosSeedData.cs
View File

@ -21,21 +21,12 @@ public class SysPosSeedData : ISqlSugarEntitySeedData<SysPos>
return
[
new SysPos{ Id=1300000000101, Name="党委书记", Code="dwsj", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="党委书记", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000102, Name="董事长", Code="dsz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="董事长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000103, Name="副董事长", Code="fdsz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副董事长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000104, Name="总经理", Code="zjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="总经理", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000105, Name="副总经理", Code="fzjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副总经理", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000106, Name="部门经理", Code="bmjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="部门经理", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000107, Name="部门副经理", Code="bmfjl", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="部门副经理", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000108, Name="主任", Code="zr", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="主任", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000109, Name="副主任", Code="fzr", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副主任", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000110, Name="局长", Code="jz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="局长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000111, Name="副局长", Code="fjz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副局长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000112, Name="科长", Code="kz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="科长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000113, Name="副科长", Code="fkz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副科长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000114, Name="财务", Code="cw", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="财务", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000115, Name="职员", Code="zy", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="职员", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000116, Name="其他", Code="qt", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="其他", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000102, Name="局长", Code="jz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="局长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000103, Name="副局长", Code="fjz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副局长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000104, Name="科长", Code="kz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="科长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000105, Name="副科长", Code="fkz", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="副科长", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000106, Name="职员", Code="zy", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="职员", TenantId=SqlSugarConst.DefaultTenantId },
new SysPos{ Id=1300000000107, Name="其他", Code="qt", CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Remark="其他", TenantId=SqlSugarConst.DefaultTenantId },
];
}
}

36
Admin.NET/Admin.NET.Core/SeedData/SysRoleMenuSeedData.cs
View File

@ -48,16 +48,17 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
new SysRoleMenu{ Id=1300000000147, RoleId=1300000000101, MenuId=1310000000137 },
new SysRoleMenu{ Id=1300000000148, RoleId=1300000000101, MenuId=1310000000138 },
new SysRoleMenu{ Id=1300000000149, RoleId=1300000000101, MenuId=1310000000139 },
new SysRoleMenu{ Id=1300000000150, RoleId=1300000000101, MenuId=1310000000140 },
// 机构管理
new SysRoleMenu{ Id=1300000000151, RoleId=1300000000101, MenuId=1310000000141 },
new SysRoleMenu{ Id=1300000000152, RoleId=1300000000101, MenuId=1310000000142 },
//new SysRoleMenu{ Id=1300000000152, RoleId=1300000000101, MenuId=1310000000142 },
new SysRoleMenu{ Id=1300000000153, RoleId=1300000000101, MenuId=1310000000143 },
new SysRoleMenu{ Id=1300000000154, RoleId=1300000000101, MenuId=1310000000144 },
new SysRoleMenu{ Id=1300000000155, RoleId=1300000000101, MenuId=1310000000145 },
// 职位管理
new SysRoleMenu{ Id=1300000000161, RoleId=1300000000101, MenuId=1310000000151 },
new SysRoleMenu{ Id=1300000000162, RoleId=1300000000101, MenuId=1310000000152 },
new SysRoleMenu{ Id=1300000000163, RoleId=1300000000101, MenuId=1310000000153 },
//new SysRoleMenu{ Id=1300000000163, RoleId=1300000000101, MenuId=1310000000153 },
new SysRoleMenu{ Id=1300000000164, RoleId=1300000000101, MenuId=1310000000154 },
new SysRoleMenu{ Id=1300000000165, RoleId=1300000000101, MenuId=1310000000155 },
new SysRoleMenu{ Id=1300000000166, RoleId=1300000000101, MenuId=1310000000156 },
@ -74,7 +75,6 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
new SysRoleMenu{ Id=1300000000184, RoleId=1300000000101, MenuId=1310000000174 },
new SysRoleMenu{ Id=1300000000185, RoleId=1300000000101, MenuId=1310000000175 },
new SysRoleMenu{ Id=1300000000186, RoleId=1300000000101, MenuId=1310000000176 },
new SysRoleMenu{ Id=1300000000187, RoleId=1300000000101, MenuId=1310000000177 },
// 三方账号
new SysRoleMenu{ Id=1300000000191, RoleId=1300000000101, MenuId=1310000000181 },
new SysRoleMenu{ Id=1300000000192, RoleId=1300000000101, MenuId=1310000000182 },
@ -93,8 +93,11 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
////// 平台管理
new SysRoleMenu{ Id=1300000000201, RoleId=1300000000101, MenuId=1310000000301 },
// 菜单管理
new SysRoleMenu{ Id=1300000000221, RoleId=1300000000101, MenuId=1310000000322 },
// 字典管理
new SysRoleMenu{ Id=1300000000221, RoleId=1300000000101, MenuId=1310000000321 },
new SysRoleMenu{ Id=1300000000222, RoleId=1300000000101, MenuId=1310000000323 },
new SysRoleMenu{ Id=1300000000223, RoleId=1300000000101, MenuId=1310000000324 },
new SysRoleMenu{ Id=1300000000224, RoleId=1300000000101, MenuId=1310000000325 },
// 配置参数
new SysRoleMenu{ Id=1300000000231, RoleId=1300000000101, MenuId=1310000000331 },
new SysRoleMenu{ Id=1300000000232, RoleId=1300000000101, MenuId=1310000000332 },
new SysRoleMenu{ Id=1300000000233, RoleId=1300000000101, MenuId=1310000000333 },
@ -161,6 +164,8 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
new SysRoleMenu{ Id=1300000001444, RoleId=1300000000101, MenuId=1310000000444 },
new SysRoleMenu{ Id=1300000001445, RoleId=1300000000101, MenuId=1310000000445 },
new SysRoleMenu{ Id=1300000001446, RoleId=1300000000101, MenuId=1310000000446 },
// 更新日志
new SysRoleMenu{ Id=1300000001451, RoleId=1300000000101, MenuId=1310000000451 },
////// 日志管理
new SysRoleMenu{ Id=1300000000301, RoleId=1300000000101, MenuId=1310000000501 },
new SysRoleMenu{ Id=1300000000311, RoleId=1300000000101, MenuId=1310000000511 },
@ -178,21 +183,20 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
new SysRoleMenu{ Id=1300000000341, RoleId=1300000000101, MenuId=1310000000541 },
new SysRoleMenu{ Id=1300000000342, RoleId=1300000000101, MenuId=1310000000542 },
new SysRoleMenu{ Id=1300000000343, RoleId=1300000000101, MenuId=1310000000543 },
new SysRoleMenu{ Id=1300000000351, RoleId=1300000000101, MenuId=1310000000551 },
new SysRoleMenu{ Id=1300000000352, RoleId=1300000000101, MenuId=1310000000552 },
new SysRoleMenu{ Id=1300000000353, RoleId=1300000000101, MenuId=1310000000553 },
////// 帮助文档
new SysRoleMenu{ Id=1300000000401, RoleId=1300000000101, MenuId=1310000000701 },
new SysRoleMenu{ Id=1300000000402, RoleId=1300000000101, MenuId=1310000000711 },
new SysRoleMenu{ Id=1300000000403, RoleId=1300000000101, MenuId=1310000000712 },
new SysRoleMenu{ Id=1300000000404, RoleId=1300000000101, MenuId=1310000000713 },
new SysRoleMenu{ Id=1300000000405, RoleId=1300000000101, MenuId=1310000000714 },
new SysRoleMenu{ Id=1300000000455, RoleId=1300000000101, MenuId=1310000000801 },
new SysRoleMenu{ Id=1300000000401, RoleId=1300000000101, MenuId=1320000000101 },
new SysRoleMenu{ Id=1300000000402, RoleId=1300000000101, MenuId=1320000000111 },
new SysRoleMenu{ Id=1300000000403, RoleId=1300000000101, MenuId=1320000000121 },
new SysRoleMenu{ Id=1300000000404, RoleId=1300000000101, MenuId=1320000000201 },
// 其他角色默认菜单
////// 数据面板【1300000000102】
new SysRoleMenu{ Id=1300000000501, RoleId=1300000000102, MenuId=1300000000101 },
new SysRoleMenu{ Id=1300000000502, RoleId=1300000000102, MenuId=1300000000111 },
new SysRoleMenu{ Id=1300000000503, RoleId=1300000000102, MenuId=1300000000121 },
// 机构管理
new SysRoleMenu{ Id=1300000000511, RoleId=1300000000102, MenuId=1310000000142 },
// 个人中心
new SysRoleMenu{ Id=1300000000521, RoleId=1300000000102, MenuId=1310000000161 },
new SysRoleMenu{ Id=1300000000522, RoleId=1300000000102, MenuId=1310000000162 },
@ -204,8 +208,6 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
new SysRoleMenu{ Id=1300000000601, RoleId=1300000000103, MenuId=1300000000101 },
new SysRoleMenu{ Id=1300000000602, RoleId=1300000000103, MenuId=1300000000111 },
new SysRoleMenu{ Id=1300000000603, RoleId=1300000000103, MenuId=1300000000121 },
// 机构管理
new SysRoleMenu{ Id=1300000000611, RoleId=1300000000103, MenuId=1310000000142 },
// 个人中心
new SysRoleMenu{ Id=1300000000621, RoleId=1300000000103, MenuId=1310000000161 },
new SysRoleMenu{ Id=1300000000622, RoleId=1300000000103, MenuId=1310000000162 },
@ -217,8 +219,6 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
new SysRoleMenu{ Id=1300000000701, RoleId=1300000000104, MenuId=1300000000101 },
new SysRoleMenu{ Id=1300000000702, RoleId=1300000000104, MenuId=1300000000111 },
new SysRoleMenu{ Id=1300000000703, RoleId=1300000000104, MenuId=1300000000121 },
// 机构管理
new SysRoleMenu{ Id=1300000000711, RoleId=1300000000104, MenuId=1310000000142 },
// 个人中心
new SysRoleMenu{ Id=1300000000721, RoleId=1300000000104, MenuId=1310000000161 },
new SysRoleMenu{ Id=1300000000722, RoleId=1300000000104, MenuId=1310000000162 },
@ -230,8 +230,6 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
new SysRoleMenu{ Id=1300000000801, RoleId=1300000000105, MenuId=1300000000101 },
new SysRoleMenu{ Id=1300000000802, RoleId=1300000000105, MenuId=1300000000111 },
new SysRoleMenu{ Id=1300000000803, RoleId=1300000000105, MenuId=1300000000121 },
// 机构管理
new SysRoleMenu{ Id=1300000000811, RoleId=1300000000105, MenuId=1310000000142 },
// 个人中心
new SysRoleMenu{ Id=1300000000821, RoleId=1300000000105, MenuId=1310000000161 },
new SysRoleMenu{ Id=1300000000822, RoleId=1300000000105, MenuId=1310000000162 },

4
Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs
View File

@ -80,7 +80,7 @@ public class SysRoleService : IDynamicApiController, ITransient
public async Task<List<RoleOutput>> GetList()
{
// 当前用户已拥有的角色集合
var roleIdList = _userManager.SuperAdmin ? new List<long>() : await _sysUserRoleService.GetUserRoleIdList(_userManager.UserId);
var roleIdList = _userManager.SuperAdmin ? [] : await _sysUserRoleService.GetUserRoleIdList(_userManager.UserId);
return await _sysRoleRep.AsQueryable()
.WhereIF(!_userManager.SuperAdmin, u => u.TenantId == _userManager.TenantId) // 若非超管，则只能操作本租户的角色
@ -106,7 +106,7 @@ public class SysRoleService : IDynamicApiController, ITransient
// 授权角色基础菜单集合
var menuIdList = new List<long>
{
1300000000111, 1300000000121, // 工作台
1300000000101, 1300000000111, 1300000000121, // 工作台
1310000000161, 1310000000162, 1310000000163, 1310000000164, 1310000000165, // 个人中心
};
await _sysRoleMenuService.GrantRoleMenu(new RoleMenuInput() { Id = roleId, MenuIdList = menuIdList });

24
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.06.27",
"lastBuildTime": "2025.07.01",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -26,7 +26,7 @@
"@vue-office/pdf": "^2.0.9",
"@vueuse/core": "^13.4.0",
"@vxe-ui/plugin-export-xlsx": "^4.2.2",
"@vxe-ui/plugin-render-element": "^4.0.11",
"@vxe-ui/plugin-render-element": "^4.0.12",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"animate.css": "^4.1.1",
@ -67,7 +67,7 @@
"sm-crypto-v2": "^1.12.0",
"sortablejs": "^1.15.6",
"splitpanes": "^4.0.4",
"sql-formatter": "^15.6.5",
"sql-formatter": "^15.6.6",
"uuid": "^11.1.0",
"vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10",
@ -84,8 +84,8 @@
"vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.6.35",
"vxe-table": "^4.13.48",
"vxe-pc-ui": "^4.6.39",
"vxe-table": "^4.13.50",
"xe-utils": "^3.7.5",
"xlsx-js-style": "^1.2.0"
},
@ -93,20 +93,20 @@
"@iconify/vue": "^5.0.0",
"@plugin-web-update-notification/vite": "^2.0.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.15.33",
"@types/node": "^22.15.34",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.35.0",
"@typescript-eslint/parser": "^8.35.0",
"@typescript-eslint/eslint-plugin": "^8.35.1",
"@typescript-eslint/parser": "^8.35.1",
"@vitejs/plugin-vue": "^6.0.0",
"@vitejs/plugin-vue-jsx": "^5.0.0",
"@vitejs/plugin-vue-jsx": "^5.0.1",
"@vue/compiler-sfc": "^3.5.17",
"code-inspector-plugin": "^0.20.12",
"eslint": "^9.29.0",
"code-inspector-plugin": "^0.20.14",
"eslint": "^9.30.0",
"eslint-plugin-vue": "^10.2.0",
"globals": "^16.2.0",
"less": "^4.3.0",
"prettier": "^3.6.1",
"prettier": "^3.6.2",
"rollup-plugin-visualizer": "^6.0.3",
"sass": "^1.89.2",
"terser": "^5.43.1",

2
Web/src/views/system/user/component/editUser.vue
View File

@ -310,9 +310,11 @@ const openDialog = async (row: any) => {
state.ruleForm.extOrgIdList = resExtOrg.data.result;
} else {
state.ruleForm.accountType = 777; // 默认普通账号类型
state.ruleForm.posId = 1300000000106; // 默认职位
const { data } = await getAPI(SysRoleApi).apiSysRoleListGet();
state.availableRoles = data.result ?? [];
state.grantedRoles = [];
// state.grantedRoles = [{ id: 1300000000104, name: '仅本人数据' }]; // 默认仅本人数据角色
}
state.isShowDialog = true;
};