From 153f3762685cc511ee560e99f622194260935183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Wed, 26 Nov 2025 20:52:56 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E7=A7=9F=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增租户 初始化 四个角色 (管理员,基地管理,技术员,普通用户) --- .../service/permission/RoleServiceImpl.java | 2 +- .../service/tenant/TenantServiceImpl.java | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java index 4b934b97..4ecf79b8 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java @@ -194,7 +194,7 @@ public class RoleServiceImpl implements RoleService { public List getRoleByCode(String code) { LambdaQueryWrapperX x = new LambdaQueryWrapperX<>(); x.eqIfPresent(RoleDO::getCode, code); - x.ne(RoleDO::getType, 1); +// x.ne(RoleDO::getType, 1); return roleMapper.selectList(x); } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java index 5434e9ff..8c1507c0 100755 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java @@ -165,7 +165,8 @@ public class TenantServiceImpl implements TenantService { // 创建租户的管理员 TenantUtils.execute(tenant.getId(), () -> { // 创建角色 - Long roleId = createRole(tenantPackage); +// Long roleId = createRole(tenantPackage); + Long roleId = createRole4Customization(tenantPackage); // 创建用户，并分配角色 Long userId = createUser(roleId, createReqVO); // 修改租户的管理员 @@ -193,6 +194,23 @@ public class TenantServiceImpl implements TenantService { return roleId; } + private Long createRole4Customization(TenantPackageDO tenantPackage) { + RoleSaveReqVO reqVO = new RoleSaveReqVO(); + reqVO.setName("管理员").setCode("1").setSort(1).setRemark("系统自动生成"); + roleService.createRole(reqVO, RoleTypeEnum.SYSTEM.getType()); + + reqVO.setName("基地主管").setCode("2").setSort(2).setRemark("系统自动生成"); + roleService.createRole(reqVO, RoleTypeEnum.SYSTEM.getType()); + + reqVO.setName("技术员").setCode("3").setSort(3).setRemark("系统自动生成"); + roleService.createRole(reqVO, RoleTypeEnum.SYSTEM.getType()); + + reqVO.setName("普通用户").setCode("4").setSort(4).setRemark("系统自动生成"); + roleService.createRole(reqVO, RoleTypeEnum.SYSTEM.getType()); + + return this.createRole(tenantPackage); + } + @Override @DSTransactional // 多数据源，使用 @DSTransactional 保证本地事务，以及数据源的切换 public void updateTenant(TenantSaveReqVO updateReqVO) {