|
|
@@ -33,8 +33,8 @@ import com.fs.common.utils.poi.ExcelUtil;
|
|
|
|
|
|
/**
|
|
|
* 角色信息
|
|
|
- *
|
|
|
-
|
|
|
+ *
|
|
|
+
|
|
|
*/
|
|
|
@RestController
|
|
|
@RequestMapping("/company/role")
|
|
|
@@ -45,10 +45,10 @@ public class CompanyRoleController extends BaseController
|
|
|
|
|
|
@Autowired
|
|
|
private TokenService tokenService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private CompanyPermissionService permissionService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private ICompanyUserService userService;
|
|
|
|
|
|
@@ -80,7 +80,7 @@ public class CompanyRoleController extends BaseController
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('company:role:query')")
|
|
|
@GetMapping(value = "/{roleId}")
|
|
|
- public AjaxResult getInfo(@PathVariable Long roleId)
|
|
|
+ public AjaxResult getInfo(@PathVariable("roleId") Long roleId)
|
|
|
{
|
|
|
return AjaxResult.success(roleService.selectCompanyRoleById(roleId));
|
|
|
}
|
|
|
@@ -128,7 +128,7 @@ public class CompanyRoleController extends BaseController
|
|
|
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
|
|
|
}
|
|
|
role.setUpdateBy(SecurityUtils.getUsername());
|
|
|
-
|
|
|
+
|
|
|
if (roleService.updateRole(role) > 0)
|
|
|
{
|
|
|
// 更新缓存用户权限
|
