From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/controller/OrganizationController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationController.java b/src/main/java/com/moral/controller/OrganizationController.java
index bfeae2d..334c2f4 100644
--- a/src/main/java/com/moral/controller/OrganizationController.java
+++ b/src/main/java/com/moral/controller/OrganizationController.java
@@ -3,6 +3,8 @@
import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
import com.moral.entity.Organization;
+import com.moral.security.auth.JwtAuthenticationToken;
+import com.moral.security.model.UserContext;
import com.moral.service.OrganizationService;
import org.springframework.web.bind.annotation.*;
@@ -37,5 +39,10 @@
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());
+ return new ResultBean<>(organization);
+ }
}
--
Gitblit v1.8.0