From 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 24 Jul 2018 11:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/OrganizationController.java | 2 +-
1 files changed, 1 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..039953d 100644
--- a/src/main/java/com/moral/controller/OrganizationController.java
+++ b/src/main/java/com/moral/controller/OrganizationController.java
@@ -42,7 +42,7 @@
@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);
}
}
--
Gitblit v1.8.0