租户

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/RoleTenantController.java

@@ -2,6 +2,7 @@ package com.fjhx.tenant.controller.tenant;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
@@ -12,7 +13,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
@@ -124,7 +124,12 @@ public class RoleTenantController extends BaseController {
      */
     @GetMapping(value = "/roleMenuTreeSelect/{roleId}")
     public AjaxResult roleMenuTreeSelect(@PathVariable("roleId") Long roleId) {
-        List<SysMenu> menus = menuService.selectMenuList(SecurityUtils.getUserId());
+        SysRole role = roleService.getById(roleId);
+        SysUser user = userService.getOne(Wrappers.<SysUser>lambdaQuery()
+                .eq(SysUser::getTenantId, role.getTenantId())
+                .eq(SysUser::getUserName, "admin"));
+        List<SysMenu> menus = menuService.selectMenuList(user.getUserId());
+
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));

hx-tenant/src/main/java/com/fjhx/tenant/service/tenant/impl/TenantInfoServiceImpl.java

@@ -150,7 +150,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
         sysUser.setDeptId(sysDept.getDeptId());
         sysUser.setTenantId(tenantInfoDto.getTenantId());
         sysUser.setUserName("admin");
-        sysUser.setNickName("管理员");
+        sysUser.setNickName(tenantInfoDto.getEnterpriseName() + "管理员");
         sysUser.setPassword(SecurityUtils.encryptPassword(tenantInfoDto.getPassword()));
         sysUser.setStatus("0");
         sysUser.setCreateBy(SecurityUtils.getUsername());