| 
														
															@@ -196,7 +196,7 @@ public class LandService extends BaseService<Land,Long> { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         }else{ 
														 | 
														
														 | 
														
															         }else{ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             List<Land> data = null; 
														 | 
														
														 | 
														
															             List<Land> data = null; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             int count; 
														 | 
														
														 | 
														
															             int count; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            int start = page.getLimit() * (page.getPage() - 1); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            int start = page.getLimit() * page.getPage(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             if(StringUtils.isNotBlank(cropType)){ 
														 | 
														
														 | 
														
															             if(StringUtils.isNotBlank(cropType)){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 data = landRepository.findListByWktAndCropType(wkt, cropType, page.getLimit(), start); 
														 | 
														
														 | 
														
															                 data = landRepository.findListByWktAndCropType(wkt, cropType, page.getLimit(), start); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 count = landRepository.findCountByWktAndCropType(wkt, cropType); 
														 | 
														
														 | 
														
															                 count = landRepository.findCountByWktAndCropType(wkt, cropType); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -204,7 +204,7 @@ public class LandService extends BaseService<Land,Long> { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 data = landRepository.findListByWkt(wkt, page.getLimit(), start); 
														 | 
														
														 | 
														
															                 data = landRepository.findListByWkt(wkt, page.getLimit(), start); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 count = landRepository.findCountByWkt(wkt); 
														 | 
														
														 | 
														
															                 count = landRepository.findCountByWkt(wkt); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             } 
														 | 
														
														 | 
														
															             } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            return PaginationHelper.create(data, count, page.getPage()); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            return PaginationHelper.create(data, count, page.page); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 |