Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-06-12 9009798abd7abfd726bcda80267c7d53dd3b8da3

 src/main/java/com/moral/controller/OrganizationController.java

@@ -39,10 +39,16 @@
      List<Organization> organizations = organizationService.getOrganizationsByName(name);
      return new ResultBean<List<Organization>>(organizations);
   }

    @GetMapping("get-my-org")
    public ResultBean<Organization> getMyOrganization(JwtAuthenticationToken token){
        UserContext userContext = token.getPrincipal();
        Organization organization = organizationService.getOrganizationById(userContext.getOrganizationId());
        return new ResultBean<>(organization);
    }
    @GetMapping("getforg")
    public ResultBean<Organization> getFatherOrg(Integer cid){
        Organization organization = organizationService.getFatherOrg(cid);
        return new ResultBean<>(organization);
    }
}