From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/controller/OrganizationController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationController.java b/src/main/java/com/moral/controller/OrganizationController.java
index 10fec6e..b515654 100644
--- a/src/main/java/com/moral/controller/OrganizationController.java
+++ b/src/main/java/com/moral/controller/OrganizationController.java
@@ -3,8 +3,13 @@
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.*;
+
+import java.util.List;
+
import javax.annotation.Resource;
@RestController
@@ -28,4 +33,22 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("list/{name}")
+ public ResultBean<List<Organization>> getOrganizationsByName(@PathVariable("name") String name) {
+ 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);
+ }
}
--
Gitblit v1.8.0