jiangjiazhi / regional-platform

Commit c2fb4472d192f84fd7fcf977a366bc8c1d0e3877

Authored by zhangrui over 9 years ago

Exists in master and in 8 other branches

bug fix

Showing 2 changed files with 12 additions and 2 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java
platform-biz-service/src/main/resources/mainOrm/Permissions.xml

...	...	@@ -20,6 +20,15 @@
20	20	private Date created;
21	21	private Integer ismenu;
22	22	private int weight;
	23	+ private String iconData;
	24	+
	25	+ public String getIconData() {
	26	+ return iconData;
	27	+ }
	28	+
	29	+ public void setIconData(String iconData) {
	30	+ this.iconData = iconData;
	31	+ }
23	32
24	33	public int getWeight() {
25	34	return weight;

...	...	@@ -10,6 +10,7 @@
10	10	<result column="function_name" property="functionName" jdbcType="VARCHAR" />
11	11	<result column="function_code" property="functionCode" jdbcType="VARCHAR" />
12	12	<result column="permission_name" property="permissionName" jdbcType="VARCHAR" />
	13	+<result column="icon_data" property="iconData" jdbcType="VARCHAR" />
13	14	<result column="action" property="action" jdbcType="VARCHAR" />
14	15	<result column="ext" property="ext" jdbcType="VARCHAR" />
15	16	<result column="url" property="url" jdbcType="VARCHAR" />
...	...	@@ -91,7 +92,7 @@
91	92
92	93
93	94	<select id="getPermissions" resultMap="PermissionsResultMap" parameterType="java.lang.Integer">
94		-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
	95	+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
95	96	from permissions where id = #{id,jdbcType=INTEGER}
96	97	</select>
97	98
...	...	@@ -167,7 +168,7 @@
167	168
168	169
169	170	<select id="queryPermissions" resultMap="PermissionsResultMap" parameterType="com.lyms.platform.permission.model.PermissionsQuery">
170		-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
	171	+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
171	172	from permissions
172	173	<include refid="PermissionsCondition" />
173	174	<include refid="orderAndLimit" />