opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 17:58:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !603 from NicholasLD/dev

Browse Source
This commit is contained in:
NicholasLD 2024-12-02 15:24:26 +00:00 committed by Gitee
commit 84546f6b2b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
View File

@ -224,9 +224,10 @@ public class AuthController {
} else { } else {
host = new URL(request.getRequestURL().toString()).getHost(); host = new URL(request.getRequestURL().toString()).getHost();
} }
// 根据域名进行筛选 // 根据域名进行筛选
List<TenantListVo> list = StreamUtils.filter(voList, vo -> List<TenantListVo> list = StreamUtils.filter(voList, vo ->
StringUtils.equals(vo.getDomain(), host)); vo != null && StringUtils.equalsIgnoreCase(vo.getDomain(), host));
result.setVoList(CollUtil.isNotEmpty(list) ? list : voList); result.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
return R.ok(result); return R.ok(result);
} }

12
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
View File

@ -124,6 +124,12 @@ public class SysTenantServiceImpl implements ISysTenantService {
new LambdaQueryWrapper<SysTenant>().select(SysTenant::getTenantId), x -> {return Convert.toStr(x);}); new LambdaQueryWrapper<SysTenant>().select(SysTenant::getTenantId), x -> {return Convert.toStr(x);});
String tenantId = generateTenantId(tenantIds); String tenantId = generateTenantId(tenantIds);
add.setTenantId(tenantId); add.setTenantId(tenantId);
String domain = add.getDomain();
if (domain != null && !domain.isBlank()) {
add.setDomain(domain.toLowerCase());
}
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (!flag) { if (!flag) {
throw new ServiceException("创建租户失败"); throw new ServiceException("创建租户失败");
@ -258,6 +264,12 @@ public class SysTenantServiceImpl implements ISysTenantService {
SysTenant tenant = MapstructUtils.convert(bo, SysTenant.class); SysTenant tenant = MapstructUtils.convert(bo, SysTenant.class);
tenant.setTenantId(null); tenant.setTenantId(null);
tenant.setPackageId(null); tenant.setPackageId(null);
String domain = tenant.getDomain();
if (domain != null && !domain.isBlank()) {
tenant.setDomain(domain.toLowerCase());
}
return baseMapper.updateById(tenant) > 0; return baseMapper.updateById(tenant) > 0;
} }