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

houruijun

2020-11-02 f14deee7baaf82e7aad6fc81a2509ba88e869afd

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

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

    /**
     * 删除