jiangjiazhi / regional-platform

Authored by rui.zhang about 9 years ago

Exists in master and in 8 other branches

add return pageinfo

Showing 3 changed files with 10 additions and 6 deletions

...	...	@@ -12,7 +12,7 @@
12	12	private String name;
13	13	private String parentId;
14	14	private Integer yn;
15		- private Integer type; //1 地名, 2 小区
	15	+ private Integer type; //1 地名, 2 社区
16	16	private CommunityConfig parent;
17	17	private List<CommunityConfig> nodes;
18	18	private String gxxq; //管辖小区

...	...	@@ -110,7 +110,7 @@
110	110	@RequestParam(value = "page", required = false) Integer page,
111	111	@RequestParam(value = "limit", required = false) Integer limit,
112	112	@RequestParam(value = "orgId", required = false) Integer orgId,
113		- @RequestParam(value = "ksId", required = false) Integer ksId) {
	113	+ @RequestParam(value = "deptId", required = false) Integer deptId) {
114	114
115	115	limit = limit == null ? 10 : limit;
116	116	page = page == null ? 1 : page;
...	...	@@ -119,7 +119,7 @@
119	119	usersQuery.setNeed("true");
120	120	usersQuery.setSort("id desc");
121	121	usersQuery.setYn(YnEnums.YES.getId());
122		- usersQuery.setKsId(ksId);
	122	+ usersQuery.setDeptId(deptId);
123	123	usersQuery.setKeyword(keyword);
124	124	usersQuery.setType(1);
125	125	usersQuery.setOrgId(orgId);
126	126
...	...	@@ -216,12 +216,16 @@
216	216	UsersQuery usersQuery = new UsersQuery();
217	217	usersQuery.setPhone(phone);
218	218	usersQuery.setYn(YnEnums.YES.getId());
219		- int count = usersService.queryUsersCount(usersQuery);
220		- if(0 == count) {
	219	+ List<Users> list = usersService.queryUsers(usersQuery);
	220	+ if(0 == list.size()) {
221	221	ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户不存在");
222	222	return;
223	223	}
224	224
	225	+ if(list.get(0).getEnable().equals(2)) {
	226	+ ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户已被禁用");
	227	+ return;
	228	+ }
225	229
226	230	LoginContext loginContext = LoginUtil.sendVerCode(phone, typeId, token);
227	231	if(null != loginContext) {