shiyang / regional-platform

Authored by rui.zhang over 9 years ago

fix bug query valid data

Showing 5 changed files with 11 additions and 6 deletions

...	...	@@ -172,6 +172,7 @@
172	172	DepartmentsQuery departmentsQuery = new DepartmentsQuery();
173	173	departmentsQuery.setNeed("true");
174	174	departmentsQuery.setSort("id desc");
	175	+ departmentsQuery.setYn(YnEnums.YES.getId());
175	176	departmentsQuery.setOrgId(orgId);
176	177	departmentsQuery.setPage(page);
177	178	departmentsQuery.setName(keyword);

...	...	@@ -192,6 +192,7 @@
192	192	OrganizationQuery organizationQuery = new OrganizationQuery();
193	193	organizationQuery.setNeed("true");
194	194	organizationQuery.setSort("id desc");
	195	+ organizationQuery.setYn(YnEnums.YES.getId());
195	196	organizationQuery.setName(keyword);
196	197	organizationQuery.setPage(page);
197	198	organizationQuery.setLimit(limit);

...	...	@@ -25,6 +25,7 @@
25	25	* Created by Administrator on 2015/9/28 0028.
26	26	*/
27	27	@Controller
	28	+@RequestMapping("/v1")
28	29	public class PermissionsController extends BaseController {
29	30
30	31	@Autowired
...	...	@@ -49,12 +50,12 @@
49	50	*/
50	51	@RequestMapping(value = "/permissions", method = RequestMethod.GET)
51	52	@TokenRequired
52		- public void getPermissions(HttpServletResponse response,
53		- @RequestParam(value = "type") Integer type,
54		- @RequestParam(value = "page") Integer page,
55		- @RequestParam(value = "limit") Integer limit,
56		- @RequestParam(value = "id", required = false) Integer id) {
57		-
	53	+ public void getPermissions(HttpServletResponse response, @RequestParam(value = "type") Integer type) {
	54	+ PermissionsQuery permissionsQuery = new PermissionsQuery();
	55	+ permissionsQuery.setType(type);
	56	+ permissionsQuery.setYn(YnEnums.YES.getId());
	57	+ List<Permissions> permissionses = permissionsService.queryPermissions(permissionsQuery);
	58	+ ResultUtils.buildSuccessResultAndWrite(response, permissionses);
58	59	}
59	60
60	61

...	...	@@ -253,6 +253,7 @@
253	253	RolesQuery rolesQuery = new RolesQuery();
254	254	rolesQuery.setNeed("true");
255	255	rolesQuery.setSort("id desc");
	256	+ rolesQuery.setYn(YnEnums.YES.getId());
256	257	rolesQuery.setType(type);
257	258	rolesQuery.setName(keyword);
258	259	rolesQuery.setPage(page);

...	...	@@ -74,6 +74,7 @@
74	74	UsersQuery usersQuery = new UsersQuery();
75	75	usersQuery.setNeed("true");
76	76	usersQuery.setSort("id desc");
	77	+ usersQuery.setYn(YnEnums.YES.getId());
77	78	usersQuery.setName(keyword);
78	79	usersQuery.setType(type);
79	80	usersQuery.setPage(page);