|
@@ -580,24 +580,9 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
*/
|
|
|
@Override
|
|
|
public List<ProjectAlarmRuleListItemVO> pageBySubList(List<ProjectAlarmRuleListItemVO> list, int pagesize, int currentPage) {
|
|
|
- int totalcount = list.size();
|
|
|
- int pagecount = 0;
|
|
|
- List<ProjectAlarmRuleListItemVO> subList;
|
|
|
- int m = totalcount % pagesize;
|
|
|
- if (m > 0) {
|
|
|
- pagecount = totalcount / pagesize + 1;
|
|
|
- } else {
|
|
|
- pagecount = totalcount / pagesize;
|
|
|
+ if ((currentPage - 1) * pagesize > list.size()) {
|
|
|
+ return new ArrayList<>();
|
|
|
}
|
|
|
- if (m == 0) {
|
|
|
- subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
|
|
|
- } else {
|
|
|
- if (currentPage == pagecount) {
|
|
|
- subList = list.subList((currentPage - 1) * pagesize, totalcount);
|
|
|
- } else {
|
|
|
- subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
|
|
|
- }
|
|
|
- }
|
|
|
- return subList;
|
|
|
+ return list.subList((currentPage - 1) * pagesize, Math.min(currentPage * pagesize, list.size()));
|
|
|
}
|
|
|
}
|