fangcheng / regional-platform

Authored by rui.zhang over 9 years ago

add return pageinfo

Showing 2 changed files with 11 additions and 3 deletions

...	...	@@ -62,6 +62,7 @@
62	62	@RequestMapping(value = "/permissions", method = RequestMethod.GET)
63	63	@TokenRequired
64	64	public void getPermissions(HttpServletResponse response,
	65	+ @RequestParam(value = "id", required = false) Integer id,
65	66	@RequestParam(value = "page",required = false) Integer page,
66	67	@RequestParam(value = "limit",required = false) Integer limit) {
67	68	PermissionsQuery permissionsQuery = new PermissionsQuery();
...	...	@@ -69,6 +70,7 @@
69	70	limit = null == limit ? 10 : limit;
70	71	permissionsQuery.setNeed("true");
71	72	permissionsQuery.setPage(page);
	73	+ permissionsQuery.setId(id);
72	74	permissionsQuery.setLimit(limit);
73	75
74	76	permissionsQuery.setYn(YnEnums.YES.getId());
...	...	@@ -122,7 +124,7 @@
122	124
123	125	//获取登录用户
124	126	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
125		- Users users = usersService.getUsersByLoginCenterId(loginState.getId());
	127	+ Users users = usersService.getUsers(loginState.getId());
126	128
127	129	Permissions permissions = new Permissions();
128	130

...	...	@@ -238,7 +238,7 @@
238	238	query.setYn(YnEnums.YES.getId());
239	239	List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
240	240	List<Roles> roles = new ArrayList<>();
241		- List<Permissions> permissions = new ArrayList<>();
	241	+ List<Permissions> permissions = null;
242	242	RolePermissionMapsQuery rolePermissionMapsQuery ;
243	243	for(UserRoleMaps roleMaps : userRoleMapses) {
244	244	roles.add(rolesService.getRoles(roleMaps.getRoleId()));
...	...	@@ -249,7 +249,13 @@
249	249	rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
250	250	List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
251	251	for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
252		- permissions.add(permissionsService.getPermissions(rolePermissionMaps.getPermissionId()));
	252	+ Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
	253	+ if(null != permissions1) {
	254	+ if(null == permissions) {
	255	+ permissions = new ArrayList<>();
	256	+ }
	257	+ permissions.add(permissions1);
	258	+ }
253	259	}
254	260	}
255	261