From 2ba1e026deb6772ddf6bf28093fc3b6d194b32eb Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 10 Apr 2020 15:25:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index 7e38efd..0bd18d0 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -336,4 +336,11 @@
     public ResultBody findAll(@RequestParam Map<String,Object> map) {
         return appUserService.findAll(map);
     }
+    /**
+     * 获取当前用的 组织下的所有人员
+     */
+    @GetMapping("users/getThisUserOrganizationUser")
+    public ResultBody getThisUserOrganizationUser(HttpServletRequest request){
+        return appUserService.getThisUserOrganizationUser(request);
+    }
 }

--
Gitblit v1.8.0