|
|
@@ -74,14 +74,14 @@ public class YunCenterController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/apply/info", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- public ModelMap findApplyAll(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "20") int size) {
|
|
|
+ public ModelMap findApplyAll(@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int size) {
|
|
|
UserAccount userAccount = SystemSession.getUserAccount();
|
|
|
if (userAccount.getSpaceUU() == null) {
|
|
|
return error(Const.SPACEUU_PERSONAL+"", "个人账号");
|
|
|
}
|
|
|
|
|
|
// 查询页面是从0开始,所以要减1
|
|
|
- return success(applyUserSpaceService.findApplyAll(--page, size, userAccount.getSpaceUU()));
|
|
|
+ return success(applyUserSpaceService.findApplyAll(page, size, userAccount.getSpaceUU()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -92,14 +92,14 @@ public class YunCenterController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/member/info", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- public ModelMap findMemberAll(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "20") int size) {
|
|
|
+ public ModelMap findMemberAll(@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int size) {
|
|
|
UserAccount userAccount = getLoginUser();
|
|
|
if (userAccount.getSpaceUU() == null) {
|
|
|
return error(Const.SPACEUU_PERSONAL+"", "个人账号");
|
|
|
}
|
|
|
|
|
|
// 查询页面是从0开始,所以要减1
|
|
|
- Page<User> pUser = userService.findMemberBySpaceUU(--page, size, userAccount.getSpaceUU());
|
|
|
+ Page<User> pUser = userService.findMemberBySpaceUU(page, size, userAccount.getSpaceUU());
|
|
|
return success(pUser);
|
|
|
}
|
|
|
|