From c1c3ca4950a4ff23fbfa31da6da697ce7d9162b9 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Fri, 22 Apr 2016 10:58:35 +0800
Subject: [PATCH] platform permission        add return pageinfo

---
 .../platform/permission/model/Departments.java     | 68 ++++++++++++++--------
 .../web/controller/DepartmentsController.java      |  4 ++
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Departments.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Departments.java
index 4eeac26..d7abdfd 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Departments.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Departments.java
@@ -2,135 +2,153 @@ package com.lyms.platform.permission.model;
 
 import java.util.Date;
 
-public class Departments {private Integer id;private Integer parentId;private String name;private Integer orgId;private String description;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private Integer type;private String shortCode;
-
-public Integer getId() {
+public class Departments {
+    private Integer id;
+    private Integer parentId;
+    private String name;
+    private Integer orgId;
+    private String description;
+    private Integer publishId;
+    private String publishName;
+    private Integer yn;
+    private Date modified;
+    private Date created;
+    private Integer type;
+    private String shortCode;
+
+    private Organization organization;
+
+    public Integer getId() {
         return id;
     }
 
 
+    public String getShortCode() {
+        return shortCode;
+    }
+
+    public void setShortCode(String shortCode) {
+        this.shortCode = shortCode;
+    }
+
+    public Organization getOrganization() {
+        return organization;
+    }
+
+    public void setOrganization(Organization organization) {
+        this.organization = organization;
+    }
 
     public void setId(Integer id) {
         this.id = id;
 
     }
 
-public Integer getParentId() {
+    public Integer getParentId() {
         return parentId;
     }
 
 
-
     public void setParentId(Integer parentId) {
         this.parentId = parentId;
 
     }
 
-public String getName() {
+    public String getName() {
         return name;
     }
 
 
-
     public void setName(String name) {
         this.name = name;
 
     }
 
-public Integer getOrgId() {
+    public Integer getOrgId() {
         return orgId;
     }
 
 
-
     public void setOrgId(Integer orgId) {
         this.orgId = orgId;
 
     }
 
-public String getDescription() {
+    public String getDescription() {
         return description;
     }
 
 
-
     public void setDescription(String description) {
         this.description = description;
 
     }
 
-public Integer getPublishId() {
+    public Integer getPublishId() {
         return publishId;
     }
 
 
-
     public void setPublishId(Integer publishId) {
         this.publishId = publishId;
 
     }
 
-public String getPublishName() {
+    public String getPublishName() {
         return publishName;
     }
 
 
-
     public void setPublishName(String publishName) {
         this.publishName = publishName;
 
     }
 
-public Integer getYn() {
+    public Integer getYn() {
         return yn;
     }
 
 
-
     public void setYn(Integer yn) {
         this.yn = yn;
 
     }
 
-public Date getModified() {
+    public Date getModified() {
         return modified;
     }
 
 
-
     public void setModified(Date modified) {
         this.modified = modified;
 
     }
 
-public Date getCreated() {
+    public Date getCreated() {
         return created;
     }
 
 
-
     public void setCreated(Date created) {
         this.created = created;
 
     }
 
-public Integer getType() {
+    public Integer getType() {
         return type;
     }
 
 
-
     public void setType(Integer type) {
         this.type = type;
 
     }
 
-public String getShortcode() {
+    public String getShortcode() {
         return shortCode;
     }
 
 
-
     public void setShortcode(String shortCode) {
         this.shortCode = shortCode;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
index bb537c8..e2cd72f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
@@ -182,6 +182,10 @@ public class DepartmentsController extends BaseController {
         //TODO 这里查询未完成 模糊查询
 
         List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery);
+        for(Departments departments : departmentses) {
+            departments.setOrganization(organizationService.getOrganization(departments.getOrgId()));
+        }
+
         ResultUtils.buildSuccessResultAndWrite(response, departmentses);
     }
 
-- 
1.8.3.1