自动提交代码

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/RoadsGpsCheckpointMapper.xml

@@ -3,7 +3,12 @@
 <mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.RoadsGpsCheckpointMapper">
 
     <select id="getRoadsGpsCheckpoint" resultType="com.dlbridge.jadp.plugins.cmpt.bean.RoadsGpsCheckpointMap">
-select id as Id,cmpt_id as cmptId, road_id as roadId,checkpoint_id as checkpointId,checkpoint_distance AS checkpointDistance,checkpoint_name as checkpointName,checkpoint_gps_name as checkpointGpsName,checkpoint_latitude as checkpointLatitude,checkpoint_longitude as checkpointLongitude from gk_roads_gps_checkpoint_map where cmpt_id=#{cmptId} and road_id=#{roadId} and is_delete=0 order by checkpoint_distance
+          select id as Id,cmpt_id as cmptId, road_id as roadId,checkpoint_id as checkpointId,
+                 checkpoint_distance AS checkpointDistance,checkpoint_name as checkpointName,
+                 checkpoint_gps_name as checkpointGpsName,checkpoint_latitude as checkpointLatitude,
+                 checkpoint_longitude as checkpointLongitude
+            from gk_roads_gps_checkpoint_map where cmpt_id=#{cmptId} and road_id=#{roadId} and is_delete=0
+            order by checkpoint_distance
     </select>
 
 

src/main/java/com/dlbridge/jadp/plugins/cmpt/utils/PageFactory.java

@@ -14,7 +14,7 @@ public class PageFactory {
         page.setCurrent(content.size());
         page.setTotal(total);
         double max = Math.ceil(total / pageable.getPageSize());
-        if (pageable.getPageNumber() == 0 || pageable.getPageNumber() == 1) {
+        if (pageable.getPageNumber() == 0 ) {
             page.setFirst(true);
             page.setLast(false);
         } else if (max >= pageable.getPageNumber()) {