From 1875d8e60737c25640918539510916b065cb4aa1 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Tue, 3 May 2016 11:43:37 +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/Roles.java | 11 +++++++++++
 .../src/main/resources/mainOrm/Users.xml               |  2 +-
 .../operate/web/controller/RolesController.java        | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java
index 99bc759..39990ff 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.permission.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class Roles {
     private Integer id;
@@ -17,6 +18,16 @@ public class Roles {
     private String hospitalid;
     private Integer permissiontype;
 
+    private List<Permissions> permissions;
+
+    public List<Permissions> getPermissions() {
+        return permissions;
+    }
+
+    public void setPermissions(List<Permissions> permissions) {
+        this.permissions = permissions;
+    }
+
     public String getHospitalid() {
         return hospitalid;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml
index 310c460..e0955b3 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Users.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml
@@ -249,7 +249,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
         <if test="yn != null and yn != ''">
             and u.yn = #{yn,jdbcType=INTEGER}
         </if>
-        <if test="type != null and type != ''">
+        <if test="type != null ">
             and u.type = #{type,jdbcType=INTEGER}
         </if>
     </select>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index 877f8da..6fde429 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -367,6 +367,24 @@ public class RolesController extends BaseController {
 
         List<Roles> roles = rolesService.queryRoles(rolesQuery);
 
+        List<Permissions> permissionses = null;
+        for(Roles roles1 : roles) {
+            permissionses = new ArrayList<>();
+            RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
+            rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
+            rolePermissionMapsQuery.setRoleId(roles1.getId());
+            List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
+
+            for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
+                Permissions permissions = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
+                if(permissions.getYn().equals(YnEnums.NO.getId())) continue;
+                permissionses.add(permissions);
+            }
+
+            roles1.setPermissions(permissionses);
+        }
+
+
 
         FrontEndResult frontEndResult = new FrontEndResult();
         frontEndResult.setPageInfo(rolesQuery.getPageInfo());
-- 
1.8.3.1