From 0dc7ad659e09d9481d06b18cc158cb0b81fab7fd Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Thu, 28 Apr 2016 17:27:21 +0800
Subject: [PATCH] platform permission        add return pageinfo

---
 platform-biz-service/src/main/resources/mainOrm/Roles.xml            | 5 ++++-
 .../com/lyms/platform/operate/web/controller/RolesController.java    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/Roles.xml b/platform-biz-service/src/main/resources/mainOrm/Roles.xml
index 2d7bb82..b15cbcf 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Roles.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Roles.xml
@@ -34,6 +34,9 @@ name = #{name,jdbcType=VARCHAR},
 <if test="publishId != null and publishId >= 0">
 publish_id = #{publishId,jdbcType=INTEGER},
 </if>
+<if test="permissiontype != null and permissiontype >= 0">
+ permissiontype = #{permissiontype,jdbcType=INTEGER},
+</if>
 <if test="publishName != null and publishName != ''">
 publish_name = #{publishName,jdbcType=VARCHAR},
 </if>
@@ -128,7 +131,7 @@ and shortCode = #{shortCode,jdbcType=VARCHAR}
 
 
 <select id="queryRoles" resultMap="RolesResultMap" parameterType="com.lyms.platform.permission.model.RolesQuery">
-select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode
+select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,permissiontype
  from roles 
 <include refid="RolesCondition" />
 <include refid="orderAndLimit" />
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 f766a8f..b385eec 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
@@ -102,7 +102,7 @@ public class RolesController extends BaseController {
     @TokenRequired
     public void updateUserPermission(HttpServletResponse response,
                             @RequestParam(value = "id") Integer id,
-                            @RequestParam(value = "type") String accessPermType) {
+                            @RequestParam(value = "type") Integer accessPermType) {
         Roles roles = rolesService.getRoles(id);
 
         Assert.notNull(roles,"角色为空.");
-- 
1.8.3.1