feats

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -140,10 +140,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     private String MARKETING_CODE;
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
-        Page<TaBuilding> page = new Page<>();
-        page.setSize(pageSize == null ? 10 : pageSize);
-        page.setCurrent(pageNum == null ? 1 : pageNum);
+        if (pageNum == null) {
+            pageNum = 1;
+        }
+        if (pageSize == null) {
+            pageSize = 10;
+        }
 
+        Page<TaBuilding> page = new Page<>(pageNum, pageSize);
         List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
 
         if (null != buildings) {

src/main/resources/mapper/TaBuildingMapper.xml

@@ -36,7 +36,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY status ASC, create_date DESC
+        ORDER BY status ASC, create_date DESC, building_id ASC
     </select>
 
     <select id="buildingListSelect" resultType="com.yunzhi.marketing.entity.TaBuilding">