From 2ee155e0e9ddc92a68349851f3bf6e7221ad8cf3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 31 Jul 2019 15:30:54 +0800
Subject: [PATCH] 修改排放量sql语句，新增选择公司和设备的条件
---
src/main/java/com/moral/controller/OrganizationController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationController.java b/src/main/java/com/moral/controller/OrganizationController.java
index 039953d..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.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