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

侯瑞军

2020-05-14 293d5042a773595ded45bdc9c69c4555ab9c5dd5

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleOrganizationController.java

@@ -113,8 +113,8 @@
        return sysRoleOrganizationService.getTree(params,user);
    }
    @ApiOperation(value = "获取数据权限的map")
    @GetMapping("getRoleOrg")
    public Map<String, Object> getRoleOrgMap(@RequestParam List<SysRole> list) {
    @PostMapping("getRoleOrg")
    public Map<String, Object> getRoleOrgMap(@RequestBody List<SysRole> list) {
        SysUser user=new SysUser();
        user.setRoles(list);
        return sysRoleOrganizationService.getRoleOrgMap(user);