拉取master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -225,10 +225,6 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
 
 
     public List<SarStandItems> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
-        //分页查询的总数
-        Integer count=dao.sarItemCount(page);
-        page.getPager().setRowCount(count);
-
         //排序
         if (page.getOrderBy()!=null && page.getOrder()!=null){
 
@@ -246,7 +242,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
             page.setOrder("DESC");
         }
 
-
+        //分页查询的总数
+        Integer count=dao.sarItemCount(page);
+        page.getPager().setRowCount(count);
         List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
         return sarStandItems;
     }