boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm): 租户管理

Browse Source 
- 新增租户 初始化 四个角色 (管理员,基地管理,技术员,普通用户)
This commit is contained in:
达富斌
2025-11-26 20:52:56 +08:00
parent d73b86c794
commit 153f376268
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
View File

@@ -194,7 +194,7 @@ public class RoleServiceImpl implements RoleService {
public List<RoleDO> getRoleByCode(String code) {
LambdaQueryWrapperX<RoleDO> x = new LambdaQueryWrapperX<>();
x.eqIfPresent(RoleDO::getCode, code);
x.ne(RoleDO::getType, 1);
// x.ne(RoleDO::getType, 1);
return roleMapper.selectList(x);
}

20
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
View File

@@ -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) {