diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java index 3923282..dcab483 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerSettingServiceImpl.java @@ -10,6 +10,7 @@ import com.gxwebsoft.common.core.web.PageResult; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; +import java.util.Comparator; import java.util.List; /** @@ -24,7 +25,7 @@ public class ShopDealerSettingServiceImpl extends ServiceImpl pageRel(ShopDealerSettingParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("update_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -32,10 +33,14 @@ public class ShopDealerSettingServiceImpl extends ServiceImpl listRel(ShopDealerSettingParam param) { List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); + if (list == null || list.size() < 2) { + return list; + } + list.sort(Comparator.comparing( + ShopDealerSetting::getUpdateTime, + Comparator.nullsLast(Integer::compareTo) + ).reversed()); + return list; } @Override