浪潮对接单点登录:租户数据隔离功能3

zouyu

3 天以前 848d609a35569b029bbdd5ab91c1df2a0f568819

 src/main/java/com/ruoyi/project/system/controller/SysRoleController.java

@@ -2,6 +2,8 @@


import java.util.List;

import javax.servlet.http.HttpServletResponse;



import com.ruoyi.common.utils.SecurityUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.validation.annotation.Validated;

@@ -45,10 +47,10 @@


    @Autowired

    private TokenService tokenService;

    


    @Autowired

    private SysPermissionService permissionService;

    


    @Autowired

    private ISysUserService userService;



@@ -102,6 +104,7 @@
            return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");

        }

        role.setCreateBy(getUsername());

        role.setTenantId(SecurityUtils.getLoginUser().getTenantId());

        return toAjax(roleService.insertRole(role));



    }

@@ -132,8 +135,8 @@
            LoginUser loginUser = getLoginUser();

            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())

            {

                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));

                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));

                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));

                tokenService.setLoginUser(loginUser);

            }

            return success();