From 86f6ce717c64848692aa858c4d54c5a7a7787757 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: Thu, 9 Feb 2023 11:38:00 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/SysLoginController.java | 21 +++++++- .../com/ruoyi/web/domain/vo/TenantListVo.java | 17 ++++++ .../system/SysTenantController.java | 10 ---- .../system/service/ISysTenantService.java | 5 -- .../service/impl/SysTenantServiceImpl.java | 11 ---- ruoyi-ui/src/api/login.js | 11 ++++ ruoyi-ui/src/api/system/tenant.js | 7 --- ruoyi-ui/src/views/login.vue | 53 ++++--------------- 8 files changed, 59 insertions(+), 76 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java 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 447f86284..dae66be89 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 @@ -1,19 +1,24 @@ package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; +import cn.hutool.core.bean.BeanUtil; 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.satoken.utils.LoginHelper; import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.system.domain.bo.SysTenantBo; import com.ruoyi.system.domain.vo.RouterVo; +import com.ruoyi.system.domain.vo.SysTenantVo; import com.ruoyi.system.domain.vo.SysUserVo; import com.ruoyi.system.service.ISysMenuService; +import com.ruoyi.system.service.ISysTenantService; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.web.service.SysLoginService; import com.ruoyi.web.domain.vo.LoginVo; +import com.ruoyi.web.domain.vo.TenantListVo; import com.ruoyi.web.domain.vo.UserInfoVo; +import com.ruoyi.web.service.SysLoginService; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -37,6 +42,7 @@ public class SysLoginController { private final SysLoginService loginService; private final ISysMenuService menuService; private final ISysUserService userService; + private final ISysTenantService tenantService; /** * 登录方法 @@ -99,6 +105,19 @@ public class SysLoginController { return R.ok("退出成功"); } + /** + * 登录页面租户下拉框 + * + * @return 租户列表 + */ + @SaIgnore + @GetMapping("/tenant/list") + public R> tenantList() { + List tenantList = tenantService.queryList(new SysTenantBo()); + List voList = BeanUtil.copyToList(tenantList, TenantListVo.class); + return R.ok(voList); + } + /** * 获取用户信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java new file mode 100644 index 000000000..c36ec4a51 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java @@ -0,0 +1,17 @@ +package com.ruoyi.web.domain.vo; + +import lombok.Data; + +/** + * 租户列表 + * + * @author Lion Li + */ +@Data +public class TenantListVo { + + private String tenantId; + + private String companyName; + +} 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 6fcb0639f..c8040bd38 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 @@ -1,7 +1,6 @@ package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaIgnore; import com.baomidou.lock.annotation.Lock4j; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.domain.R; @@ -52,15 +51,6 @@ public class SysTenantController extends BaseController { return sysTenantService.queryPageList(bo, pageQuery); } - /** - * 根据关键字查询租户列表 - */ - @SaIgnore - @GetMapping("/listByWord/{keyword}") - public R> listByWord(@PathVariable String keyword) { - return R.ok(sysTenantService.listByWord(keyword)); - } - /** * 导出租户列表 */ 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 e8354964e..a8b8a18ce 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 @@ -30,11 +30,6 @@ public interface ISysTenantService { */ TableDataInfo queryPageList(SysTenantBo bo, PageQuery pageQuery); - /** - * 根据关键字查询租户列表 - */ - List listByWord(String keyword); - /** * 查询租户列表 */ 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 99d3678ab..0cc1f2464 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 @@ -77,17 +77,6 @@ public class SysTenantServiceImpl implements ISysTenantService { return baseMapper.selectVoList(lqw); } - /** - * 根据关键字查询租户列表 - */ - @Override - public List listByWord(String keyword) { - SysTenantBo bo = new SysTenantBo(); - bo.setCompanyName(keyword); - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - private LambdaQueryWrapper buildQueryWrapper(SysTenantBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId()); diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js index 0ac58102e..6b8d85703 100644 --- a/ruoyi-ui/src/api/login.js +++ b/ruoyi-ui/src/api/login.js @@ -70,3 +70,14 @@ export function getCodeSms() { timeout: 20000 }) } + +// 获取租户列表 +export function tenantList() { + return request({ + url: '/tenant/list', + headers: { + isToken: false + }, + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/system/tenant.js b/ruoyi-ui/src/api/system/tenant.js index 2b974119a..bd10a8afe 100644 --- a/ruoyi-ui/src/api/system/tenant.js +++ b/ruoyi-ui/src/api/system/tenant.js @@ -56,10 +56,3 @@ export function delTenant(id) { }) } -// 根据关键字获取相关企业名称 -export function listByWord(data) { - return request({ - url: '/system/tenant/listByWord/' + data, - method: 'get' - }) -} diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 18fb74f7f..a5fbc2114 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -3,33 +3,15 @@