From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/controller/OrganizationController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationController.java b/src/main/java/com/moral/controller/OrganizationController.java
index 334c2f4..b515654 100644
--- a/src/main/java/com/moral/controller/OrganizationController.java
+++ b/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.getOrganizationsById(userContext.getOrganizationId());
+ 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);
}
}
--
Gitblit v1.8.0