Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 ce0651907f18a57dae80065e01589e975530f53e

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -64,7 +64,7 @@
    @Autowired
    private ISysMenuService menuService;

    @PreAuthorize("@ss.hasPermi('system:role')")
//    @PreAuthorize("@ss.hasPermi('system:role')")
    @ApiOperation(value = "角色列表")
    @PostMapping("/system/role/list")
    public AjaxResult list(@RequestBody SysRoleQuery query)
@@ -73,7 +73,7 @@
        return AjaxResult.success(list);
    }

    @PreAuthorize("@ss.hasPermi('system:role')")
//    @PreAuthorize("@ss.hasPermi('system:role')")
    @ApiOperation(value = "角色列表不分页")
    @PostMapping("/system/role/listNotPage")
    public AjaxResult list()
@@ -81,7 +81,7 @@
        List<SysRole> list = roleService.selectRoleList(new SysRole());
        return AjaxResult.success(list);
    }
    @PreAuthorize("@ss.hasPermi('system:role:count')")
//    @PreAuthorize("@ss.hasPermi('system:role:count')")
    @ApiOperation(value = "角色数量统计")
    @PostMapping("/system/role/roleCount")
    public AjaxResult roleCount()
@@ -110,7 +110,7 @@
    /**
     * 根据角色编号获取详细信息
     */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
//     @PreAuthorize("@ss.hasPermi('system:role:query')")
    @GetMapping(value = "/system/role/{roleId}")
    public AjaxResult getInfo(@PathVariable Long roleId)
    {
@@ -154,7 +154,7 @@
    /**
     * 新增角色
     */
    @PreAuthorize("@ss.hasPermi('system:role:add')")
//    @PreAuthorize("@ss.hasPermi('system:role:add')")
    @ApiOperation(value = "新增角色")
    @Log(title = "角色信息-新增角色", businessType = BusinessType.INSERT)
    @PostMapping("/system/role/add")
@@ -172,7 +172,7 @@
    /**
     * 修改保存角色
     */
    @PreAuthorize("@ss.hasPermi('system:role:edit')")
//    @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @ApiOperation(value = "编辑角色",response = SysRoleDTO.class)
    @Log(title = "角色信息-编辑角色", businessType = BusinessType.UPDATE)
    @PostMapping("/api/system/role/edit")