jiangjiazhi / regional-platform

Authored by rui.zhang about 9 years ago

Exists in master and in 8 other branches

add return pageinfo

Showing 2 changed files with 5 additions and 2 deletions

...	...	@@ -34,6 +34,9 @@
34	34	<if test="publishId != null and publishId >= 0">
35	35	publish_id = #{publishId,jdbcType=INTEGER},
36	36	</if>
	37	+<if test="permissiontype != null and permissiontype >= 0">
	38	+ permissiontype = #{permissiontype,jdbcType=INTEGER},
	39	+</if>
37	40	<if test="publishName != null and publishName != ''">
38	41	publish_name = #{publishName,jdbcType=VARCHAR},
39	42	</if>
...	...	@@ -128,7 +131,7 @@
128	131
129	132
130	133	<select id="queryRoles" resultMap="RolesResultMap" parameterType="com.lyms.platform.permission.model.RolesQuery">
131		-select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode
	134	+select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,permissiontype
132	135	from roles
133	136	<include refid="RolesCondition" />
134	137	<include refid="orderAndLimit" />

...	...	@@ -102,7 +102,7 @@
102	102	@TokenRequired
103	103	public void updateUserPermission(HttpServletResponse response,
104	104	@RequestParam(value = "id") Integer id,
105		- @RequestParam(value = "type") String accessPermType) {
	105	+ @RequestParam(value = "type") Integer accessPermType) {
106	106	Roles roles = rolesService.getRoles(id);
107	107
108	108	Assert.notNull(roles,"角色为空.");