lbqms.git - Gitblit

			@@ -1,14 +1,16 @@
			package com.ruoyi.web.controller;

			import cn.dev33.satoken.annotation.SaIgnore;
			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.collection.CollUtil;
			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.MapstructUtils;
			import com.ruoyi.common.core.utils.StreamUtils;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.satoken.utils.LoginHelper;
			import com.ruoyi.common.tenant.helper.TenantHelper;
			import com.ruoyi.system.domain.SysMenu;
			import com.ruoyi.system.domain.bo.SysTenantBo;
			import com.ruoyi.system.domain.vo.RouterVo;
			@@ -118,11 +120,11 @@
			@GetMapping("/tenant/list")
			public R<List<TenantListVo>> tenantList(HttpServletRequest request) throws Exception {
			List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
			List<TenantListVo> voList = BeanUtil.copyToList(tenantList, TenantListVo.class);
			List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class);
			// 获取域名
			String host = new URL(request.getRequestURL().toString()).getHost();
			// 根据域名进行筛选
			List<TenantListVo> list = voList.stream().filter(vo -> StringUtils.equals(vo.getDomain(), host)).toList();
			List<TenantListVo> list = StreamUtils.filter(voList, vo -> StringUtils.equals(vo.getDomain(), host));
			return R.ok(CollUtil.isNotEmpty(list) ? list : voList);
			}

			@@ -135,6 +137,10 @@
			public R<UserInfoVo> getInfo() {
			UserInfoVo userInfoVo = new UserInfoVo();
			LoginUser loginUser = LoginHelper.getLoginUser();
			if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
			// 超级管理员如果重新加载用户信息需清除动态租户
			TenantHelper.clearDynamic();
			}
			SysUserVo user = userService.selectUserById(loginUser.getUserId());
			userInfoVo.setUser(user);
			userInfoVo.setPermissions(loginUser.getMenuPermission());