From c2fb4472d192f84fd7fcf977a366bc8c1d0e3877 Mon Sep 17 00:00:00 2001
From: zhangrui <zhangrui@lymsh.com>
Date: Sat, 30 Jul 2016 16:45:53 +0800
Subject: [PATCH]           bug fix

---
 .../java/com/lyms/platform/permission/model/Permissions.java     | 9 +++++++++
 platform-biz-service/src/main/resources/mainOrm/Permissions.xml  | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java
index 533ebbf..5f406cf 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java
@@ -20,6 +20,15 @@ public class Permissions {
     private Date created;
     private Integer ismenu;
     private int weight;
+    private String iconData;
+
+    public String getIconData() {
+        return iconData;
+    }
+
+    public void setIconData(String iconData) {
+        this.iconData = iconData;
+    }
 
     public int getWeight() {
         return weight;
diff --git a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml
index 67451e2..ca43ec2 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml
@@ -10,6 +10,7 @@
 <result column="function_name" property="functionName" jdbcType="VARCHAR" />
 <result column="function_code" property="functionCode" jdbcType="VARCHAR" />
 <result column="permission_name" property="permissionName" jdbcType="VARCHAR" />
+<result column="icon_data" property="iconData" jdbcType="VARCHAR" />
 <result column="action" property="action" jdbcType="VARCHAR" />
 <result column="ext" property="ext" jdbcType="VARCHAR" />
 <result column="url" property="url" jdbcType="VARCHAR" />
@@ -91,7 +92,7 @@ delete from permissions where id = #{id,jdbcType=INTEGER}
 
 
 <select id="getPermissions" resultMap="PermissionsResultMap" parameterType="java.lang.Integer">
-select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu,weight
+select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu,weight,icon_data
  from permissions where id = #{id,jdbcType=INTEGER}
 </select>
 
@@ -167,7 +168,7 @@ and ismenu = #{ismenu,jdbcType=INTEGER}
 
 
 <select id="queryPermissions" resultMap="PermissionsResultMap" parameterType="com.lyms.platform.permission.model.PermissionsQuery">
-select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu,weight
+select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu,weight,icon_data
  from permissions 
 <include refid="PermissionsCondition" />
 <include refid="orderAndLimit" />
-- 
1.8.3.1