From 937e8cc53fa45be9089b8241be269658fa674577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 13 Feb 2023 09:51:36 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=9F=9F=E5=90=8D=E8=8E=B7=E5=8F=96=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/SysLoginController.java | 17 +++-------------- .../controller/system/SysTenantController.java | 4 ++-- .../ruoyi/system/service/ISysTenantService.java | 2 +- .../service/impl/SysTenantServiceImpl.java | 7 +++---- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java index 10274c44c..f55b5c8e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java @@ -3,11 +3,11 @@ package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.SmsLoginBody; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.satoken.utils.LoginHelper; import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.domain.bo.SysTenantBo; @@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.net.URL; -import java.util.ArrayList; import java.util.List; /** @@ -120,21 +119,11 @@ public class SysLoginController { public R> tenantList(HttpServletRequest request) throws Exception { List tenantList = tenantService.queryList(new SysTenantBo()); List voList = BeanUtil.copyToList(tenantList, TenantListVo.class); - // 获取域名 String host = new URL(request.getRequestURL().toString()).getHost(); // 根据域名进行筛选 - List list = new ArrayList<>(); - voList.forEach(vo -> { - if (ObjectUtil.equal(vo.getDomain(), host)) { - list.add(vo); - } - }); - if (CollUtil.isNotEmpty(list)) { - return R.ok(list); - } - - return R.ok(voList); + List list = voList.stream().filter(vo -> StringUtils.equals(vo.getDomain(), host)).toList(); + return R.ok(CollUtil.isNotEmpty(list) ? list : voList); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java index 95daf10d6..630db9d5e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java @@ -91,8 +91,8 @@ public class SysTenantController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) { - if (UserConstants.NOT_UNIQUE.equals(sysTenantService.checkCompanyNameUnique(bo))) { - throw new ServiceException("新增租户'" + bo.getCompanyName() + "'失败，公司名称已存在"); + if (TenantConstants.NOT_PASS.equals(sysTenantService.checkCompanyNameUnique(bo))) { + throw new ServiceException("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在"); } SysUserBo userBo = new SysUserBo(); userBo.setUserName(bo.getUsername()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java index 13de3eb50..ee7072550 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTenantService.java @@ -56,7 +56,7 @@ public interface ISysTenantService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); /** - * 校验公司名称是否唯一 + * 校验企业名称是否唯一 */ String checkCompanyNameUnique(SysTenantBo bo); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index d41d5be4b..bc78b1a39 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.TenantConstants; -import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StringUtils; @@ -284,7 +283,7 @@ public class SysTenantServiceImpl implements ISysTenantService { } /** - * 校验公司名称是否唯一 + * 校验企业名称是否唯一 */ @Override public String checkCompanyNameUnique(SysTenantBo bo) { @@ -292,9 +291,9 @@ public class SysTenantServiceImpl implements ISysTenantService { .eq(SysTenant::getCompanyName, bo.getCompanyName()) .ne(ObjectUtil.isNotNull(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId())); if (exist) { - return UserConstants.NOT_UNIQUE; + return TenantConstants.NOT_PASS; } - return UserConstants.UNIQUE; + return TenantConstants.PASS; } /**