Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

2 天以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

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


    @Autowired

    private TokenService tokenService;

    


    @Autowired

    private SysPermissionService permissionService;

    


    @Autowired

    private ISysUserService userService;



@@ -132,8 +132,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();