兰宝车间质量管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
疯狂的狮子li
2021-05-11 c33c3de43afabebbc685f0738843a7ac53ae50c5 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java


@@ -1,17 +1,6 @@


package com.ruoyi.web.controller.system;




import java.util.List;


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


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


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.DeleteMapping;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.PutMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import cn.hutool.core.lang.Validator;


import com.ruoyi.common.annotation.Log;


import com.ruoyi.common.constant.UserConstants;


import com.ruoyi.common.core.controller.BaseController;


@@ -22,12 +11,17 @@


import com.ruoyi.common.enums.BusinessType;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.common.utils.ServletUtils;


import com.ruoyi.common.utils.StringUtils;


import com.ruoyi.common.utils.poi.ExcelUtil;


import com.ruoyi.framework.web.service.SysPermissionService;


import com.ruoyi.framework.web.service.TokenService;


import com.ruoyi.system.service.ISysRoleService;


import com.ruoyi.system.service.ISysUserService;


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


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


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;




import java.util.List;




/**


 * 角色信息


@@ -123,7 +117,7 @@


        {


            // 更新缓存用户权限


            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());


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


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


            {


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


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