From 0292e1cee85acf20e768a4176067926a089c5995 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Tue, 3 May 2016 15:52:12 +0800
Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/permission/model/Users.java     |  9 +++++++++
 .../platform/operate/web/controller/UsersController.java   | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
index f0c874e..9f7e05d 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
@@ -27,6 +27,7 @@ public class Users {
     private List<Roles> roles;
     private Departments departmentses;
     private Organization organization;
+    private List<Organization> organizations;
     private String foreignId;
 
     private String roleStr;
@@ -72,6 +73,14 @@ public class Users {
         this.organization = organization;
     }
 
+    public List<Organization> getOrganizations() {
+        return organizations;
+    }
+
+    public void setOrganizations(List<Organization> organizations) {
+        this.organizations = organizations;
+    }
+
     public List<Roles> getRoles() {
         return roles;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index 06d423d..a3d389c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -85,8 +85,20 @@ public class UsersController extends BaseController {
         //设置用户角色信息
         for(Users user : users) {
             user.setRoles(this.getUserRoles(user.getId()));
-            user.setOrganization(organizationService.getOrganization(user.getOrgId()));
+
             user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
+
+            UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
+            userOrganizationMapsQuery.setUserId(user.getId());
+            userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
+            List<UserOrganizationMaps> userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
+            List<Organization> organizations = null;
+            for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
+                organizations = new ArrayList<>();
+                organizations.add(organizationService.getOrganization(userOrganizationMaps.getOrgId()));
+            }
+
+            user.setOrganizations(organizations);
         }
 
         FrontEndResult frontEndResult = new FrontEndResult();
-- 
1.8.3.1