From a6ff89dd8eed9ea4e6162ff5491d4583e4ef621a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 08 Aug 2019 14:34:17 +0800
Subject: [PATCH] AQI计算

---
 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