Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 653cb0ed3e7be231059480cee266b11f1c9ba11e

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

@@ -86,7 +86,10 @@
        TTemplate byId = templateService.getById(templateId);
        SysRole sysRole = roleService.selectRoleById(byId.getRoleId());
        List<SysRole> sysRoles = new ArrayList<>();
        if (sysRole!=null){
        sysRoles.add(sysRole);

        }
        return AjaxResult.success(sysRoles);
    }
    @PreAuthorize("@ss.hasPermi('system:role:count')")