|
@@ -243,8 +243,7 @@ public class UserRPCServiceImpl implements UserService {
|
|
return userDTOForMTPage;
|
|
return userDTOForMTPage;
|
|
}else{
|
|
}else{
|
|
List<UserDTOForMT> userDTOForMTs = new ArrayList<>();
|
|
List<UserDTOForMT> userDTOForMTs = new ArrayList<>();
|
|
- List<UserDTOForMT> userDTOForMTList = getSubList(pageable, userDTOForMTs);
|
|
|
|
- Page<UserDTOForMT> userDTOForMTPage = new PageImpl<UserDTOForMT>(userDTOForMTList, pageable, userDTOForMTs.size());
|
|
|
|
|
|
+ Page<UserDTOForMT> userDTOForMTPage = new PageImpl<UserDTOForMT>(userDTOForMTs, pageable, userDTOForMTs.size());
|
|
return userDTOForMTPage;
|
|
return userDTOForMTPage;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -262,9 +261,9 @@ public class UserRPCServiceImpl implements UserService {
|
|
pagecount = totalcount / pageSize;
|
|
pagecount = totalcount / pageSize;
|
|
}
|
|
}
|
|
|
|
|
|
-// if (activePage < 0) {
|
|
|
|
-// throw new HttpBadRequestException("wrong page format");
|
|
|
|
-// }
|
|
|
|
|
|
+ if (activePage < 0) {
|
|
|
|
+ throw new HttpBadRequestException("wrong page format");
|
|
|
|
+ }
|
|
if (pagecount == 0) {
|
|
if (pagecount == 0) {
|
|
return userDTOForMTs;
|
|
return userDTOForMTs;
|
|
}
|
|
}
|