@@ -28,11 +28,16 @@ public class PagingUtils { | |||||
int startIndex = (pageNum - 1) * pageSize; | int startIndex = (pageNum - 1) * pageSize; | ||||
int endIndex = Math.min(startIndex + pageSize, fullList.size()); | int endIndex = Math.min(startIndex + pageSize, fullList.size()); | ||||
// Ensure we don't go out of bounds | |||||
// If startIndex is beyond the fullList size, return the remaining records | |||||
if (startIndex < fullList.size()) { | if (startIndex < fullList.size()) { | ||||
return fullList.subList(startIndex, endIndex); | return fullList.subList(startIndex, endIndex); | ||||
} else { | } else { | ||||
return Collections.emptyList(); // Return empty list if start index is out of bounds | |||||
// If there are records available, return the remaining records | |||||
if (!fullList.isEmpty()) { | |||||
return fullList.subList(fullList.size() - Math.min(pageSize, fullList.size()), fullList.size()); | |||||
} else { | |||||
return Collections.emptyList(); // Return empty list if fullList is empty | |||||
} | |||||
} | } | ||||
} | } | ||||
} | } |
@@ -2,7 +2,6 @@ package com.ffii.fpsms.modules.master.service | |||||
import com.ffii.core.support.AbstractBaseEntityService | import com.ffii.core.support.AbstractBaseEntityService | ||||
import com.ffii.core.support.JdbcDao | import com.ffii.core.support.JdbcDao | ||||
import com.ffii.fpsms.modules.master.dto.ItemFilterRequestDTO | |||||
import com.ffii.fpsms.modules.master.entity.* | import com.ffii.fpsms.modules.master.entity.* | ||||
import com.ffii.fpsms.modules.master.web.models.ItemQc | import com.ffii.fpsms.modules.master.web.models.ItemQc | ||||
import com.ffii.fpsms.modules.master.web.models.ItemWithQcResponse | import com.ffii.fpsms.modules.master.web.models.ItemWithQcResponse | ||||
@@ -4,7 +4,6 @@ import com.ffii.core.exception.NotFoundException | |||||
import com.ffii.core.response.RecordsRes | import com.ffii.core.response.RecordsRes | ||||
import com.ffii.core.utils.CriteriaArgsBuilder | import com.ffii.core.utils.CriteriaArgsBuilder | ||||
import com.ffii.core.utils.PagingUtils | import com.ffii.core.utils.PagingUtils | ||||
import com.ffii.fpsms.modules.master.dto.ItemFilterRequestDTO | |||||
import com.ffii.fpsms.modules.master.entity.Items | import com.ffii.fpsms.modules.master.entity.Items | ||||
import com.ffii.fpsms.modules.master.service.ItemsService | import com.ffii.fpsms.modules.master.service.ItemsService | ||||
import com.ffii.fpsms.modules.master.web.models.ItemWithQcResponse | import com.ffii.fpsms.modules.master.web.models.ItemWithQcResponse | ||||