排序

src/main/java/com/hotwj/platform/common/helper/DriverLoginContextHelper.java

@@ -61,7 +61,7 @@ public final class DriverLoginContextHelper {
             lqw.eq(HotDriver::getId, userId);
             lqw.eq(HotDriver::getStatus, 1L);
             lqw.eq(HotDriver::getAuditStatus, 1);
-            lqw.orderByDesc(HotDriver::getCreateTime);
+            lqw.orderByDesc(HotDriver::getCreateTime, HotDriver::getId);
             lqw.last("limit 1");
             HotDriverMapper hotDriverMapper = SpringUtils.getBean(HotDriverMapper.class);
             HotDriver driver = hotDriverMapper.selectOne(lqw);

src/main/java/com/hotwj/platform/config/riskLevelConfig/service/impl/HotRiskLevelConfigServiceImpl.java

@@ -73,7 +73,7 @@ public class HotRiskLevelConfigServiceImpl implements IHotRiskLevelConfigService
     private LambdaQueryWrapper<HotRiskLevelConfig> buildQueryWrapper(HotRiskLevelConfigBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotRiskLevelConfig> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotRiskLevelConfig::getLevelValue);
+        lqw.orderByDesc(HotRiskLevelConfig::getLevelValue, HotRiskLevelConfig::getId);
         lqw.eq(bo.getLevelValue() != null, HotRiskLevelConfig::getLevelValue, bo.getLevelValue());
         lqw.like(StringUtils.isNotBlank(bo.getLevelName()), HotRiskLevelConfig::getLevelName, bo.getLevelName());
         lqw.eq(StringUtils.isNotBlank(bo.getDescription()), HotRiskLevelConfig::getDescription, bo.getDescription());

src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/impl/HotVehicleThreeInspectServiceImpl.java

@@ -305,7 +305,7 @@ public class HotVehicleThreeInspectServiceImpl implements IHotVehicleThreeInspec
     private LambdaQueryWrapper<HotVehicleThreeInspect> buildQueryWrapper(HotVehicleThreeInspectBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotVehicleThreeInspect> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotVehicleThreeInspect::getCreateTime);
+        lqw.orderByDesc(HotVehicleThreeInspect::getCreateTime, HotVehicleThreeInspect::getId);
         Object beginTime = params == null ? null : params.get("beginTime");
         Object endTime = params == null ? null : params.get("endTime");
         if (beginTime != null && endTime != null) {
@@ -818,7 +818,7 @@ public class HotVehicleThreeInspectServiceImpl implements IHotVehicleThreeInspec
                 Wrappers.<HotVehicleThreeInspect>lambdaQuery()
                         .eq(HotVehicleThreeInspect::getVehicleId, vehicleId)
                         .eq(HotVehicleThreeInspect::getIsDeleted, 0L)
-                        .orderByDesc(HotVehicleThreeInspect::getCreateTime)
+                        .orderByDesc(HotVehicleThreeInspect::getCreateTime, HotVehicleThreeInspect::getId)
                         .last("LIMIT 1")
         );
     }

src/main/java/com/hotwj/platform/config/vehicleThreeInspectItem/service/impl/HotVehicleThreeInspectItemServiceImpl.java

@@ -72,7 +72,7 @@ public class HotVehicleThreeInspectItemServiceImpl implements IHotVehicleThreeIn
     private LambdaQueryWrapper<HotVehicleThreeInspectItem> buildQueryWrapper(HotVehicleThreeInspectItemBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotVehicleThreeInspectItem> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(HotVehicleThreeInspectItem::getSortNo);
+        lqw.orderByAsc(HotVehicleThreeInspectItem::getSortNo, HotVehicleThreeInspectItem::getId);
         lqw.eq(bo.getCompanyId() != null, HotVehicleThreeInspectItem::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getInspectId() != null, HotVehicleThreeInspectItem::getInspectId, bo.getInspectId());
         lqw.eq(bo.getInspectType() != null, HotVehicleThreeInspectItem::getInspectType, bo.getInspectType());

src/main/java/com/hotwj/platform/driverManagement/driver/service/impl/HotDriverServiceImpl.java

@@ -270,7 +270,7 @@ public class HotDriverServiceImpl implements IHotDriverService {
     private LambdaQueryWrapper<HotDriver> buildQueryWrapper(HotDriverBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotDriver> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotDriver::getCreateTime);
+        lqw.orderByDesc(HotDriver::getCreateTime, HotDriver::getId);
         lqw.in(CollUtil.isNotEmpty(bo.getIds()), HotDriver::getId, bo.getIds());
         lqw.eq(bo.getCompanyId() != null, HotDriver::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getEntryDate() != null, HotDriver::getEntryDate, bo.getEntryDate());

src/main/java/com/hotwj/platform/driverManagement/driverAnnualAssessment/service/impl/HotDriverAnnualAssessmentServiceImpl.java

@@ -76,7 +76,7 @@ public class HotDriverAnnualAssessmentServiceImpl implements IHotDriverAnnualAss
     private LambdaQueryWrapper<HotDriverAnnualAssessment> buildQueryWrapper(HotDriverAnnualAssessmentBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotDriverAnnualAssessment> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotDriverAnnualAssessment::getAssessmentTime);
+        lqw.orderByDesc(HotDriverAnnualAssessment::getAssessmentTime, HotDriverAnnualAssessment::getId);
         lqw.eq(bo.getCompanyId() != null, HotDriverAnnualAssessment::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getDriverId() != null, HotDriverAnnualAssessment::getDriverId, bo.getDriverId());
         lqw.eq(StringUtils.isNotBlank(bo.getAssessmentContent()), HotDriverAnnualAssessment::getAssessmentContent, bo.getAssessmentContent());

src/main/java/com/hotwj/platform/driverManagement/driverHealthReport/service/impl/HotDriverHealthReportServiceImpl.java

@@ -74,7 +74,7 @@ public class HotDriverHealthReportServiceImpl implements IHotDriverHealthReportS
     private LambdaQueryWrapper<HotDriverHealthReport> buildQueryWrapper(HotDriverHealthReportBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotDriverHealthReport> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotDriverHealthReport::getReportDate);
+        lqw.orderByDesc(HotDriverHealthReport::getReportDate, HotDriverHealthReport::getId);
         lqw.eq(bo.getCompanyId() != null, HotDriverHealthReport::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getDriverId() != null, HotDriverHealthReport::getDriverId, bo.getDriverId());
         lqw.eq(bo.getReportDate() != null, HotDriverHealthReport::getReportDate, bo.getReportDate());

src/main/java/com/hotwj/platform/flow/service/impl/SysFlowServiceImpl.java

@@ -249,7 +249,7 @@ public class SysFlowServiceImpl implements ISysFlowService {
         if (StrUtil.isNotBlank(isRead)) {
             lqw.eq(SysFlowTask::getIsRead, Integer.valueOf(isRead));
         }
-        lqw.orderByDesc(SysFlowTask::getCreateTime);
+        lqw.orderByDesc(SysFlowTask::getCreateTime, SysFlowTask::getTaskId);
         List<SysFlowTask> records = taskMapper.selectList(lqw);
         fillFlowInfo(records);
         filterInvalidTrainingStudyTodos(records);
@@ -264,7 +264,7 @@ public class SysFlowServiceImpl implements ISysFlowService {
         if (loginUser != null && cn.hutool.core.util.StrUtil.isNotBlank(loginUser.getBusinessUserId())) {
             lqw.ne(SysFlowTask::getApproverId, loginUser.getBusinessUserId());
         }
-        lqw.orderByDesc(SysFlowTask::getCreateTime);
+        lqw.orderByDesc(SysFlowTask::getCreateTime, SysFlowTask::getTaskId);
         List<SysFlowTask> records = taskMapper.selectList(lqw);
         fillFlowInfo(records);
         filterInvalidTrainingStudyTodos(records);
@@ -634,7 +634,7 @@ public class SysFlowServiceImpl implements ISysFlowService {
     public List<SysFlowTaskHis> getHistory(String instanceId) {
         LambdaQueryWrapper<SysFlowTaskHis> lqw = new LambdaQueryWrapper<>();
         lqw.eq(SysFlowTaskHis::getInstanceId, instanceId);
-        lqw.orderByAsc(SysFlowTaskHis::getAuditTime);
+        lqw.orderByAsc(SysFlowTaskHis::getAuditTime, SysFlowTaskHis::getHisId);
         return taskHisMapper.selectList(lqw);
     }
 
@@ -757,7 +757,7 @@ public class SysFlowServiceImpl implements ISysFlowService {
         SysFlowTask task = taskMapper.selectOne(
                 Wrappers.<SysFlowTask>lambdaQuery()
                         .in(SysFlowTask::getInstanceId, instanceIds)
-                        .orderByDesc(SysFlowTask::getCreateTime)
+                        .orderByDesc(SysFlowTask::getCreateTime, SysFlowTask::getTaskId)
                         .last("limit 1")
         );
         return task != null ? task.getTaskId() : null;

src/main/java/com/hotwj/platform/noticeManagerment/companyNotice/service/impl/HotCompanyNoticeServiceImpl.java

@@ -91,7 +91,7 @@ public class HotCompanyNoticeServiceImpl implements IHotCompanyNoticeService {
         lqw.eq(HotCompanyNotice::getIsPublished, 1L);
         lqw.apply("NOT EXISTS (SELECT 1 FROM hot_company_notice_read r WHERE r.notice_id = hot_company_notice.id AND r.reader_id = {0} AND r.is_deleted = 0)", readerId);
         lqw.orderByDesc(HotCompanyNotice::getIsTop);
-        lqw.orderByDesc(HotCompanyNotice::getCreateTime);
+        lqw.orderByDesc(HotCompanyNotice::getCreateTime, HotCompanyNotice::getId);
         lqw.orderByDesc(HotCompanyNotice::getId);
         lqw.last("limit 1");
         HotCompanyNotice notice = baseMapper.selectOne(lqw);
@@ -104,7 +104,7 @@ public class HotCompanyNoticeServiceImpl implements IHotCompanyNoticeService {
     private LambdaQueryWrapper<HotCompanyNotice> buildQueryWrapper(HotCompanyNoticeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotCompanyNotice> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotCompanyNotice::getCreateTime);
+        lqw.orderByDesc(HotCompanyNotice::getCreateTime, HotCompanyNotice::getId);
         Object beginTime = params.get("beginTime");
         Object endTime = params.get("endTime");
         if (beginTime != null && endTime != null) {
@@ -140,7 +140,7 @@ public class HotCompanyNoticeServiceImpl implements IHotCompanyNoticeService {
         HotCompanyNotice maxSortNotice = baseMapper.selectOne(new LambdaQueryWrapper<HotCompanyNotice>()
             .select(HotCompanyNotice::getSortNo)
             .eq(HotCompanyNotice::getCompanyId, bo.getCompanyId())
-            .orderByDesc(HotCompanyNotice::getSortNo)
+            .orderByDesc(HotCompanyNotice::getSortNo, HotCompanyNotice::getId)
             .last("limit 1"));
         long maxSort = (maxSortNotice != null && maxSortNotice.getSortNo() != null) ? maxSortNotice.getSortNo() : 0L;
         add.setSortNo(maxSort + 1);

src/main/java/com/hotwj/platform/noticeManagerment/fileTypeConfig/service/impl/HotFileTypeConfigServiceImpl.java

@@ -121,7 +121,7 @@ public class HotFileTypeConfigServiceImpl implements IHotFileTypeConfigService {
     private LambdaQueryWrapper<HotFileTypeConfig> buildQueryWrapper(HotFileTypeConfigBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotFileTypeConfig> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(HotFileTypeConfig::getSortOrder).orderByDesc(BaseEntity::getCreateTime);
+        lqw.orderByAsc(HotFileTypeConfig::getSortOrder).orderByDesc(BaseEntity::getCreateTime).orderByDesc(HotFileTypeConfig::getId);
         lqw.eq(bo.getCompanyId() != null, HotFileTypeConfig::getCompanyId, bo.getCompanyId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), HotFileTypeConfig::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getValue()), HotFileTypeConfig::getValue, bo.getValue());

src/main/java/com/hotwj/platform/noticeManagerment/lawRegulation/service/impl/HotLawRegulationServiceImpl.java

@@ -96,7 +96,7 @@ public class HotLawRegulationServiceImpl implements IHotLawRegulationService {
         HotLawRegulation maxEntity = baseMapper.selectOne(Wrappers.<HotLawRegulation>lambdaQuery()
                 .select(HotLawRegulation::getSortno)
                 .eq(add.getCompanyId() != null, HotLawRegulation::getCompanyId, add.getCompanyId())
-                .orderByDesc(HotLawRegulation::getSortno)
+                .orderByDesc(HotLawRegulation::getSortno, HotLawRegulation::getId)
                 .last("LIMIT 1"));
         Long maxSort = (maxEntity != null && maxEntity.getSortno() != null) ? maxEntity.getSortno() : 0L;
         add.setSortno(maxSort + 1);

src/main/java/com/hotwj/platform/noticeManagerment/noticeReply/service/impl/HotNoticeReplyServiceImpl.java

@@ -359,7 +359,7 @@ public class HotNoticeReplyServiceImpl implements IHotNoticeReplyService {
                         .eq(HotCompanySafetyManager::getIsDeleted, 0L)
                         .eq(HotCompanySafetyManager::getIsResigned, 0L)
                         .eq(HotCompanySafetyManager::getStatus, 1L)
-                        .orderByDesc(HotCompanySafetyManager::getCreateTime)
+                        .orderByDesc(HotCompanySafetyManager::getCreateTime, HotCompanySafetyManager::getId)
         );
         if (heads != null && !heads.isEmpty()) {
             return String.valueOf(heads.get(0).getId());
@@ -370,7 +370,7 @@ public class HotNoticeReplyServiceImpl implements IHotNoticeReplyService {
                         .eq(HotCompanySafetyManager::getIsDeleted, 0L)
                         .eq(HotCompanySafetyManager::getIsResigned, 0L)
                         .eq(HotCompanySafetyManager::getStatus, 1L)
-                        .orderByDesc(HotCompanySafetyManager::getCreateTime)
+                        .orderByDesc(HotCompanySafetyManager::getCreateTime, HotCompanySafetyManager::getId)
         );
         if (managers == null || managers.isEmpty()) {
             return null;

src/main/java/com/hotwj/platform/noticeManagerment/notificationIssue/controller/HotNotificationIssueController.java

@@ -305,7 +305,7 @@ public class HotNotificationIssueController extends BaseController {
                         .eq(HotCompanySafetyManager::getIsDeleted, 0L)
                         .eq(HotCompanySafetyManager::getIsResigned, 0L)
                         .eq(HotCompanySafetyManager::getStatus, 1L)
-                        .orderByDesc(HotCompanySafetyManager::getCreateTime)
+                        .orderByDesc(HotCompanySafetyManager::getCreateTime, HotCompanySafetyManager::getId)
         );
         if (heads != null && !heads.isEmpty()) {
             return String.valueOf(heads.get(0).getId());
@@ -316,7 +316,7 @@ public class HotNotificationIssueController extends BaseController {
                         .eq(HotCompanySafetyManager::getIsDeleted, 0L)
                         .eq(HotCompanySafetyManager::getIsResigned, 0L)
                         .eq(HotCompanySafetyManager::getStatus, 1L)
-                        .orderByDesc(HotCompanySafetyManager::getCreateTime)
+                        .orderByDesc(HotCompanySafetyManager::getCreateTime, HotCompanySafetyManager::getId)
         );
         if (managers == null || managers.isEmpty()) {
             return null;

src/main/java/com/hotwj/platform/noticeManagerment/systemNotification/service/impl/HotSystemNotificationServiceImpl.java

@@ -127,7 +127,7 @@ public class HotSystemNotificationServiceImpl implements IHotSystemNotificationS
     private LambdaQueryWrapper<HotSystemNotification> buildQueryWrapper(HotSystemNotificationBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotSystemNotification> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotSystemNotification::getSendTime);
+        lqw.orderByDesc(HotSystemNotification::getSendTime, HotSystemNotification::getId);
         Object beginTime = params == null ? null : params.get("beginTime");
         Object endTime = params == null ? null : params.get("endTime");
         if (beginTime != null && endTime != null) {

src/main/java/com/hotwj/platform/pay/service/impl/PayRechargeOpenServiceImpl.java

@@ -325,13 +325,13 @@ public class PayRechargeOpenServiceImpl implements PayRechargeOpenService {
                 .in(PayOrder::getStatus, PayOrderStatusEnum.WAITING.getStatus(), PayOrderStatusEnum.PAYING.getStatus())
                 .gt(PayOrder::getExpireTime, now)
                 .ge(PayOrder::getCreateTime, DateUtil.offsetMinute(now, -ORDER_EXPIRE_MINUTES))
-                .orderByAsc(PayOrder::getCreateTime)
+                .orderByAsc(PayOrder::getCreateTime, PayOrder::getId)
                 .last("limit " + COMPENSATE_BATCH_SIZE));
         List<PayOrder> expiredOrders = payOrderMapper.selectList(Wrappers.<PayOrder>lambdaQuery()
                 .in(PayOrder::getStatus, PayOrderStatusEnum.WAITING.getStatus(), PayOrderStatusEnum.PAYING.getStatus())
                 .isNotNull(PayOrder::getExpireTime)
                 .le(PayOrder::getExpireTime, now)
-                .orderByAsc(PayOrder::getExpireTime)
+                .orderByAsc(PayOrder::getExpireTime, PayOrder::getId)
                 .last("limit " + COMPENSATE_BATCH_SIZE));
 
         int queried = 0;

src/main/java/com/hotwj/platform/regulationManagement/policyRevision/service/impl/HotPolicyRevisionServiceImpl.java

@@ -109,7 +109,7 @@ public class HotPolicyRevisionServiceImpl implements IHotPolicyRevisionService {
     private LambdaQueryWrapper<HotPolicyRevision> buildQueryWrapper(HotPolicyRevisionBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotPolicyRevision> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotPolicyRevision::getCreatedTime);
+        lqw.orderByDesc(HotPolicyRevision::getCreatedTime, HotPolicyRevision::getId);
         lqw.eq(bo.getCompanyId() != null, HotPolicyRevision::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getPolicyId() != null, HotPolicyRevision::getPolicyId, bo.getPolicyId());
         lqw.eq(bo.getVersionNo() != null, HotPolicyRevision::getVersionNo, bo.getVersionNo());
@@ -185,7 +185,7 @@ public class HotPolicyRevisionServiceImpl implements IHotPolicyRevisionService {
     public Long nextVersionNo(Long policyId) {
         LambdaQueryWrapper<HotPolicyRevision> lqw = Wrappers.lambdaQuery();
         lqw.eq(HotPolicyRevision::getPolicyId, policyId);
-        lqw.orderByDesc(HotPolicyRevision::getVersionNo);
+        lqw.orderByDesc(HotPolicyRevision::getVersionNo, HotPolicyRevision::getId);
         lqw.last("limit 1");
         HotPolicyRevision last = baseMapper.selectOne(lqw);
         Long lastNo = last != null ? last.getVersionNo() : 0L;

src/main/java/com/hotwj/platform/resourceManagement/company/service/impl/SysCompanyRoleServiceImpl.java

@@ -75,7 +75,7 @@ public class SysCompanyRoleServiceImpl implements ISysCompanyRoleService {
 
     private LambdaQueryWrapper<SysCompanyRole> buildQueryWrapper(SysCompanyRoleBo bo) {
         LambdaQueryWrapper<SysCompanyRole> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(SysCompanyRole::getCompanyId).orderByAsc(SysCompanyRole::getRoleSort);
+        lqw.orderByAsc(SysCompanyRole::getCompanyId).orderByAsc(SysCompanyRole::getRoleSort).orderByAsc(SysCompanyRole::getId);
         lqw.eq(bo.getCompanyId() != null, SysCompanyRole::getCompanyId, bo.getCompanyId());
         lqw.like(StringUtils.isNotBlank(bo.getRoleName()), SysCompanyRole::getRoleName, bo.getRoleName());
         lqw.eq(StringUtils.isNotBlank(bo.getRoleKey()), SysCompanyRole::getRoleKey, bo.getRoleKey());

src/main/java/com/hotwj/platform/resourceManagement/company/service/impl/SysCompanyServiceImpl.java

@@ -163,7 +163,7 @@ public class SysCompanyServiceImpl implements ISysCompanyService {
     private LambdaQueryWrapper<SysCompany> buildQueryWrapper(SysCompanyBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysCompany> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(SysCompany::getCreateTime);
+        lqw.orderByDesc(SysCompany::getCreateTime, SysCompany::getId);
         lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), SysCompany::getCompanyName, bo.getCompanyName());
         lqw.like(StringUtils.isNotBlank(bo.getCompanyShortName()), SysCompany::getCompanyShortName, bo.getCompanyShortName());
         lqw.eq(StringUtils.isNotBlank(bo.getCompanyType()), SysCompany::getCompanyType, bo.getCompanyType());

src/main/java/com/hotwj/platform/resourceManagement/companyChangeHistory/service/impl/HotCompanyChangeHistoryServiceImpl.java

@@ -142,7 +142,7 @@ public class HotCompanyChangeHistoryServiceImpl implements IHotCompanyChangeHist
         lqw.like(StringUtils.isNotBlank(bo.getName()), HotCompanyChangeHistory::getName, bo.getName());
         lqw.like(StringUtils.isNotBlank(bo.getPhone()), HotCompanyChangeHistory::getPhone, bo.getPhone());
         lqw.eq(StringUtils.isNotBlank(bo.getChangeType()), HotCompanyChangeHistory::getChangeType, bo.getChangeType());
-        lqw.orderByDesc(HotCompanyChangeHistory::getChangeTime);
+        lqw.orderByDesc(HotCompanyChangeHistory::getChangeTime, HotCompanyChangeHistory::getId);
         return lqw;
     }
 

src/main/java/com/hotwj/platform/resourceManagement/companyPermissionGrant/service/impl/HotCompanyPermissionGrantServiceImpl.java

@@ -176,7 +176,7 @@ public class HotCompanyPermissionGrantServiceImpl implements IHotCompanyPermissi
         lqw.eq(StringUtils.isNotBlank(bo.getPermissionCode()), HotCompanyPermissionGrant::getPermissionCode, bo.getPermissionCode());
         lqw.eq(bo.getStatus() != null, HotCompanyPermissionGrant::getStatus, bo.getStatus());
         lqw.eq(HotCompanyPermissionGrant::getIsDeleted, 0L);
-        lqw.orderByDesc(HotCompanyPermissionGrant::getCreateTime);
+        lqw.orderByDesc(HotCompanyPermissionGrant::getCreateTime, HotCompanyPermissionGrant::getId);
         return lqw;
     }
 

src/main/java/com/hotwj/platform/resourceManagement/companyPolicy/service/impl/HotCompanyPolicyServiceImpl.java

@@ -107,7 +107,7 @@ public class HotCompanyPolicyServiceImpl implements IHotCompanyPolicyService {
                 .select(HotCompanyPolicy::getOrderNum)
                 .eq(HotCompanyPolicy::getCompanyId, bo.getCompanyId())
                 .eq(HotCompanyPolicy::getPolicyType, bo.getPolicyType())
-                .orderByDesc(HotCompanyPolicy::getOrderNum)
+                .orderByDesc(HotCompanyPolicy::getOrderNum, HotCompanyPolicy::getId)
                 .last("limit 1"));
         long maxOrder = (maxOrderPolicy != null && maxOrderPolicy.getOrderNum() != null) ? maxOrderPolicy.getOrderNum() : 0L;
         add.setOrderNum(maxOrder + 1);

src/main/java/com/hotwj/platform/resourceManagement/vehicleAnnualReview/service/impl/HotVehicleAnnualReviewServiceImpl.java

@@ -88,7 +88,7 @@ public class HotVehicleAnnualReviewServiceImpl implements IHotVehicleAnnualRevie
         return baseMapper.selectVoOne(new LambdaQueryWrapper<HotVehicleAnnualReview>()
             .eq(HotVehicleAnnualReview::getVehicleId, vehicleId)
                 .eq(HotVehicleAnnualReview::getIsDeleted, 0L)
-            .orderByDesc(HotVehicleAnnualReview::getReviewDate)
+            .orderByDesc(HotVehicleAnnualReview::getReviewDate, HotVehicleAnnualReview::getId)
             .last("LIMIT 1"));
     }
 
@@ -97,7 +97,7 @@ public class HotVehicleAnnualReviewServiceImpl implements IHotVehicleAnnualRevie
         LambdaQueryWrapper<HotVehicleAnnualReview> lqw = new LambdaQueryWrapper<HotVehicleAnnualReview>()
                 .eq(HotVehicleAnnualReview::getVehicleId, vehicleId)
                 .eq(HotVehicleAnnualReview::getIsDeleted, 0L)
-                .orderByDesc(HotVehicleAnnualReview::getReviewDate)
+                .orderByDesc(HotVehicleAnnualReview::getReviewDate, HotVehicleAnnualReview::getId)
                 .last("LIMIT 1");
         if (startDate != null) {
             lqw.ge(HotVehicleAnnualReview::getReviewDate, startDate);

src/main/java/com/hotwj/platform/resourceManagement/vehicleChange/service/impl/HotVehicleChangeServiceImpl.java

@@ -82,7 +82,7 @@ public class HotVehicleChangeServiceImpl implements IHotVehicleChangeService {
     private LambdaQueryWrapper<HotVehicleChange> buildQueryWrapper(HotVehicleChangeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotVehicleChange> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotVehicleChange::getCreateTime);
+        lqw.orderByDesc(HotVehicleChange::getCreateTime, HotVehicleChange::getId);
         lqw.eq(bo.getCompanyId() != null, HotVehicleChange::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getVehicleId() != null, HotVehicleChange::getVehicleId, bo.getVehicleId());
         lqw.like(StringUtils.isNotBlank(bo.getPlateNumber()), HotVehicleChange::getPlateNumber, bo.getPlateNumber());

src/main/java/com/hotwj/platform/resourceManagement/vehicleClaim/service/impl/HotVehicleClaimServiceImpl.java

@@ -226,7 +226,7 @@ public class HotVehicleClaimServiceImpl implements IHotVehicleClaimService {
     public HotVehicleClaimVo queryLatestByVehicleId(String vehicleId) {
         return baseMapper.selectVoOne(new LambdaQueryWrapper<HotVehicleClaim>()
                 .eq(HotVehicleClaim::getVehicleId, vehicleId)
-                .orderByDesc(HotVehicleClaim::getIncidentTime)
+                .orderByDesc(HotVehicleClaim::getIncidentTime, HotVehicleClaim::getId)
                 .last("LIMIT 1"));
     }
 }

src/main/java/com/hotwj/platform/resourceManagement/vehicleMaintenance/service/impl/HotVehicleMaintenanceServiceImpl.java

@@ -81,7 +81,7 @@ public class HotVehicleMaintenanceServiceImpl implements IHotVehicleMaintenanceS
         return baseMapper.selectVoOne(new LambdaQueryWrapper<HotVehicleMaintenance>()
             .eq(HotVehicleMaintenance::getVehicleId, vehicleId)
                 .eq(HotVehicleMaintenance::getIsDeleted, 0L)
-            .orderByDesc(HotVehicleMaintenance::getFinishTime)
+            .orderByDesc(HotVehicleMaintenance::getFinishTime, HotVehicleMaintenance::getId)
             .last("LIMIT 1"));
     }
 

src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java

@@ -212,6 +212,7 @@ public class HotVehicleServiceImpl implements IHotVehicleService {
         LambdaQueryWrapper<HotVehicle> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(HotVehicle::getArchiveNo)
                 .orderByAsc(HotVehicle::getPlateNumber)
+                .orderByAsc(HotVehicle::getId)
                 .eq(bo.getCompanyId() != null, HotVehicle::getCompanyId, bo.getCompanyId())
                 .eq(HotVehicle::getVehicleStatus, 1L)
                 .eq(HotVehicle::getOperationStatus, 1L)
@@ -238,7 +239,8 @@ public class HotVehicleServiceImpl implements IHotVehicleService {
                 .eq(HotVehicle::getCompanyId, companyId)
                 .eq(HotVehicle::getIsDeleted, 0L)
                 .orderByAsc(HotVehicle::getArchiveNo)
-                .orderByAsc(HotVehicle::getPlateNumber));
+                .orderByAsc(HotVehicle::getPlateNumber)
+                .orderByAsc(HotVehicle::getId));
 
         List<DriverBindingVehicleItemVo> boundVehicleList = new ArrayList<>();
         List<DriverBindingVehicleItemVo> bindableVehicleList = new ArrayList<>();
@@ -266,7 +268,8 @@ public class HotVehicleServiceImpl implements IHotVehicleService {
                 .eq(HotVehicle::getCompanyId, companyId)
                 .eq(HotVehicle::getIsDeleted, 0L)
                 .orderByAsc(HotVehicle::getArchiveNo)
-                .orderByAsc(HotVehicle::getPlateNumber));
+                .orderByAsc(HotVehicle::getPlateNumber)
+                .orderByAsc(HotVehicle::getId));
         List<DriverBindingVehicleItemVo> boundVehicleList = new ArrayList<>();
         for (HotVehicle vehicle : companyVehicles) {
             if (splitCsv(vehicle.getCurrentDriver()).contains(driverId)) {
@@ -330,7 +333,8 @@ public class HotVehicleServiceImpl implements IHotVehicleService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotVehicle> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(HotVehicle::getOperationStatus)
-                .orderByAsc(HotVehicle::getArchiveNo);
+                .orderByAsc(HotVehicle::getArchiveNo)
+                .orderByAsc(HotVehicle::getId);
         lqw.eq(bo.getCompanyId() != null, HotVehicle::getCompanyId, bo.getCompanyId());
         lqw.in(CollUtil.isNotEmpty(bo.getIds()), HotVehicle::getId, bo.getIds());
         lqw.eq(StringUtils.isNotBlank(bo.getGpsParams()), HotVehicle::getGpsParams, bo.getGpsParams());
@@ -416,7 +420,7 @@ public class HotVehicleServiceImpl implements IHotVehicleService {
     private LambdaQueryWrapper<HotVehicle> buildQueryWrapperByStatus(HotVehicleStatusBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotVehicle> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotVehicle::getCreateTime);
+        lqw.orderByDesc(HotVehicle::getCreateTime, HotVehicle::getId);
         lqw.eq(bo.getCompanyId() != null, HotVehicle::getCompanyId, bo.getCompanyId());
         lqw.eq(StringUtils.isNotBlank(bo.getGpsParams()), HotVehicle::getGpsParams, bo.getGpsParams());
         lqw.eq(bo.getIsTrailer() != null, HotVehicle::getIsTrailer, bo.getIsTrailer());

src/main/java/com/hotwj/platform/resourceManagement/vehicleMileage/service/impl/HotVehicleMileageServiceImpl.java

@@ -129,7 +129,7 @@ public class HotVehicleMileageServiceImpl implements IHotVehicleMileageService {
     public List<HotVehicleMileageVo> queryListByVehicleId(String vehicleId) {
         LambdaQueryWrapper<HotVehicleMileage> lqw = Wrappers.lambdaQuery();
         lqw.eq(HotVehicleMileage::getVehicleId, vehicleId);
-        lqw.orderByDesc(HotVehicleMileage::getStartDate);
+        lqw.orderByDesc(HotVehicleMileage::getStartDate, HotVehicleMileage::getId);
         return baseMapper.selectVoList(lqw);
     }
 

src/main/java/com/hotwj/platform/resourceManagement/vehicleRepair/service/impl/HotVehicleRepairServiceImpl.java

@@ -87,7 +87,7 @@ public class HotVehicleRepairServiceImpl implements IHotVehicleRepairService {
     public HotVehicleRepairVo queryLatestByVehicleId(String vehicleId) {
         return baseMapper.selectVoOne(new LambdaQueryWrapper<HotVehicleRepair>()
             .eq(HotVehicleRepair::getVehicleId, vehicleId)
-            .orderByDesc(HotVehicleRepair::getFinishDate)
+            .orderByDesc(HotVehicleRepair::getFinishDate, HotVehicleRepair::getId)
             .last("LIMIT 1"));
     }
 

src/main/java/com/hotwj/platform/securityManagement/accidentArchive/service/impl/HotAccidentArchiveServiceImpl.java

@@ -100,7 +100,7 @@ public class HotAccidentArchiveServiceImpl implements IHotAccidentArchiveService
     private LambdaQueryWrapper<HotAccidentArchive> buildQueryWrapper(HotAccidentArchiveBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotAccidentArchive> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotAccidentArchive::getAccidentTime);
+        lqw.orderByDesc(HotAccidentArchive::getAccidentTime, HotAccidentArchive::getId);
         if (bo.getAccidentTime() != null) {
             java.util.Calendar calendarStart = java.util.Calendar.getInstance();
             calendarStart.setTime(bo.getAccidentTime());

src/main/java/com/hotwj/platform/securityManagement/hiddenDanger/service/impl/HotHiddenDangerServiceImpl.java

@@ -122,7 +122,7 @@ public class HotHiddenDangerServiceImpl implements IHotHiddenDangerService {
         } else if (hasEndTime) {
             lqw.le(HotHiddenDanger::getCheckTime, endTime);
         }
-        lqw.orderByDesc(HotHiddenDanger::getCreateTime);
+        lqw.orderByDesc(HotHiddenDanger::getCreateTime, HotHiddenDanger::getId);
         lqw.eq(bo.getCompanyId() != null, HotHiddenDanger::getCompanyId, bo.getCompanyId());
         lqw.eq(StringUtils.isNotBlank(bo.getDangerNo()), HotHiddenDanger::getDangerNo, bo.getDangerNo());
         lqw.like(StringUtils.isNotBlank(bo.getDangerName()), HotHiddenDanger::getDangerName, bo.getDangerName());

src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/service/impl/HotHiddenDangerInspectionServiceImpl.java

@@ -546,6 +546,7 @@ public class HotHiddenDangerInspectionServiceImpl implements IHotHiddenDangerIns
                 .eq(HotHiddenDangerInspectionAuditHistory::getIsDeleted, 0L)
                 .orderByDesc(HotHiddenDangerInspectionAuditHistory::getAuditRound)
                 .orderByDesc(HotHiddenDangerInspectionAuditHistory::getCreateTime)
+                .orderByDesc(HotHiddenDangerInspectionAuditHistory::getId)
         );
     }
 

src/main/java/com/hotwj/platform/securityManagement/hiddenDangerPlan/service/impl/HotHiddenDangerPlanServiceImpl.java

@@ -341,7 +341,7 @@ public class HotHiddenDangerPlanServiceImpl implements IHotHiddenDangerPlanServi
         lqw.eq(HotHiddenDangerPlan::getCompanyId, companyId);
         lqw.eq(HotHiddenDangerPlan::getIsDeleted, 0L);
         lqw.eq(HotHiddenDangerPlan::getPlanDateKey, timeInfo.getPlanDateKey());
-        lqw.orderByDesc(HotHiddenDangerPlan::getCreateTime);
+        lqw.orderByDesc(HotHiddenDangerPlan::getCreateTime, HotHiddenDangerPlan::getId);
         lqw.last("LIMIT 1");
         return baseMapper.selectOne(lqw);
     }
@@ -554,7 +554,7 @@ public class HotHiddenDangerPlanServiceImpl implements IHotHiddenDangerPlanServi
 
     private LambdaQueryWrapper<HotHiddenDangerPlan> buildQueryWrapper(HotHiddenDangerPlanBo bo) {
         LambdaQueryWrapper<HotHiddenDangerPlan> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotHiddenDangerPlan::getCreateTime);
+        lqw.orderByDesc(HotHiddenDangerPlan::getCreateTime, HotHiddenDangerPlan::getId);
         lqw.eq(bo.getCompanyId() != null, HotHiddenDangerPlan::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getInspectId() != null, HotHiddenDangerPlan::getInspectId, bo.getInspectId());
         lqw.like(StringUtils.isNotBlank(bo.getPlanName()), HotHiddenDangerPlan::getPlanName, bo.getPlanName());

src/main/java/com/hotwj/platform/securityManagement/training/service/impl/HotTrainingServiceImpl.java

@@ -88,7 +88,7 @@ public class HotTrainingServiceImpl implements IHotTrainingService {
     private LambdaQueryWrapper<HotTraining> buildQueryWrapper(HotTrainingBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotTraining> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotTraining::getCreateTime);
+        lqw.orderByDesc(HotTraining::getCreateTime, HotTraining::getId);
         lqw.eq(bo.getCompanyId() != null, HotTraining::getCompanyId, bo.getCompanyId());
         lqw.like(StringUtils.isNotBlank(bo.getPlanName()), HotTraining::getPlanName, bo.getPlanName());
         lqw.eq(StringUtils.isNotBlank(bo.getPersonType()), HotTraining::getPersonType, bo.getPersonType());

src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/service/impl/HotTrainingCourseConfigServiceImpl.java

@@ -79,7 +79,7 @@ public class HotTrainingCourseConfigServiceImpl implements IHotTrainingCourseCon
     private LambdaQueryWrapper<HotTrainingCourseConfig> buildQueryWrapper(HotTrainingCourseConfigBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotTrainingCourseConfig> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(HotTrainingCourseConfig::getSortNo);
+        lqw.orderByAsc(HotTrainingCourseConfig::getSortNo, HotTrainingCourseConfig::getId);
         lqw.eq(bo.getCompanyId() != null, HotTrainingCourseConfig::getCompanyId, bo.getCompanyId());
         lqw.like(StringUtils.isNotBlank(bo.getCourseName()), HotTrainingCourseConfig::getCourseName, bo.getCourseName());
         lqw.eq(bo.getCourseId() != null, HotTrainingCourseConfig::getCourseId, bo.getCourseId());
@@ -107,7 +107,7 @@ public class HotTrainingCourseConfigServiceImpl implements IHotTrainingCourseCon
                         .select(HotTrainingCourseConfig::getSortNo)
                         .eq(HotTrainingCourseConfig::getCompanyId, bo.getCompanyId())
                         .eq(bo.getTrainingId() != null, HotTrainingCourseConfig::getTrainingId, bo.getTrainingId())
-                        .orderByDesc(HotTrainingCourseConfig::getSortNo)
+                        .orderByDesc(HotTrainingCourseConfig::getSortNo, HotTrainingCourseConfig::getId)
                         .last("limit 1")
         );
         long max = (maxSort != null && maxSort.getSortNo() != null) ? maxSort.getSortNo() : 0L;

src/main/java/com/hotwj/platform/securityManagement/trainingCourseRecord/service/impl/HotTrainingCourseRecordServiceImpl.java

@@ -110,6 +110,7 @@ public class HotTrainingCourseRecordServiceImpl implements IHotTrainingCourseRec
         lqw.eq(bo.getTrainingCourseId() != null, HotTrainingCourseRecord::getTrainingCourseId, bo.getTrainingCourseId());
         lqw.orderByDesc(HotTrainingCourseRecord::getCompleteTime);
         lqw.orderByDesc(HotTrainingCourseRecord::getCreateTime);
+        lqw.orderByDesc(HotTrainingCourseRecord::getId);
         Page<HotTrainingCourseRecordVo> page = baseMapper.selectVoPage(new Page<>(1, 1), lqw);
         List<HotTrainingCourseRecordVo> records = page.getRecords();
         if (records == null || records.isEmpty()) {
@@ -126,7 +127,7 @@ public class HotTrainingCourseRecordServiceImpl implements IHotTrainingCourseRec
     private LambdaQueryWrapper<HotTrainingCourseRecord> buildQueryWrapper(HotTrainingCourseRecordBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotTrainingCourseRecord> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotTrainingCourseRecord::getCreateTime);
+        lqw.orderByDesc(HotTrainingCourseRecord::getCreateTime, HotTrainingCourseRecord::getId);
         lqw.eq(bo.getCompanyId() != null, HotTrainingCourseRecord::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getTrainingId() != null, HotTrainingCourseRecord::getTrainingId, bo.getTrainingId());
         lqw.eq(StringUtils.isNotBlank(bo.getUserId()), HotTrainingCourseRecord::getUserId, bo.getUserId());

src/main/java/com/hotwj/platform/securityManagement/trainingProgress/service/TrainingProgressService.java

@@ -162,7 +162,7 @@ public class TrainingProgressService {
                         .eq(HotTrainingCourseRecord::getUserId, userId)
                         .in(HotTrainingCourseRecord::getTrainingCourseId, trainingCourseIds)
                         .eq(HotTrainingCourseRecord::getIsDeleted, 0L)
-                        .orderByDesc(HotTrainingCourseRecord::getCreateTime)
+                        .orderByDesc(HotTrainingCourseRecord::getCreateTime, HotTrainingCourseRecord::getId)
         );
         if (records == null || records.isEmpty()) {
             return Map.of();

src/main/java/com/hotwj/platform/securityManagement/vehicleEntryExit/service/impl/HotVehicleEntryExitServiceImpl.java

@@ -87,7 +87,7 @@ public class HotVehicleEntryExitServiceImpl implements IHotVehicleEntryExitServi
     private LambdaQueryWrapper<HotVehicleEntryExit> buildQueryWrapper(HotVehicleEntryExitBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotVehicleEntryExit> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotVehicleEntryExit::getCreateTime);
+        lqw.orderByDesc(HotVehicleEntryExit::getCreateTime, HotVehicleEntryExit::getId);
         lqw.eq(bo.getCompanyId() != null, HotVehicleEntryExit::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getCheckTime() != null, HotVehicleEntryExit::getCheckTime, bo.getCheckTime());
         lqw.like(StringUtils.isNotBlank(bo.getCreateByName()), HotVehicleEntryExit::getCreateByName, bo.getCreateByName());

src/main/java/com/hotwj/platform/securityManagement/vehicleInoutCheck/service/impl/HotVehicleInoutCheckServiceImpl.java

@@ -90,7 +90,7 @@ public class HotVehicleInoutCheckServiceImpl implements IHotVehicleInoutCheckSer
     private LambdaQueryWrapper<HotVehicleInoutCheck> buildQueryWrapper(HotVehicleInoutCheckBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotVehicleInoutCheck> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotVehicleInoutCheck::getCheckDate);
+        lqw.orderByDesc(HotVehicleInoutCheck::getCheckDate, HotVehicleInoutCheck::getId);
         lqw.eq(bo.getRecordId() != null, HotVehicleInoutCheck::getRecordId, bo.getRecordId());
         lqw.eq(bo.getCompanyId() != null, HotVehicleInoutCheck::getCompanyId, bo.getCompanyId());
         lqw.eq(bo.getVehicleId() != null, HotVehicleInoutCheck::getVehicleId, bo.getVehicleId());

src/main/java/com/hotwj/platform/securityManagement/violationInfo/service/impl/HotViolationInfoServiceImpl.java

@@ -350,7 +350,7 @@ public class HotViolationInfoServiceImpl implements IHotViolationInfoService {
     private LambdaQueryWrapper<HotViolationInfo> buildQueryWrapper(HotViolationInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HotViolationInfo> lqw = Wrappers.lambdaQuery();
-        lqw.orderByDesc(HotViolationInfo::getOccurTime);
+        lqw.orderByDesc(HotViolationInfo::getOccurTime, HotViolationInfo::getId);
         if (bo.getOccurTime() != null) {
             java.util.Calendar calendarStart = java.util.Calendar.getInstance();
             calendarStart.setTime(bo.getOccurTime());

src/main/java/org/dromara/generator/service/GenTableServiceImpl.java

@@ -74,7 +74,8 @@ public class GenTableServiceImpl implements IGenTableService {
     public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
         return genTableColumnMapper.selectList(new LambdaQueryWrapper<GenTableColumn>()
             .eq(GenTableColumn::getTableId, tableId)
-            .orderByAsc(GenTableColumn::getSort));
+            .orderByAsc(GenTableColumn::getSort)
+            .orderByAsc(GenTableColumn::getColumnId));
     }
 
     /**
@@ -105,7 +106,8 @@ public class GenTableServiceImpl implements IGenTableService {
             .like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment()))
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 "create_time", params.get("beginTime"), params.get("endTime"))
-            .orderByDesc("update_time");
+            .orderByDesc("update_time")
+            .orderByDesc("table_id");
         return wrapper;
     }
 

src/main/java/org/dromara/system/mapper/SysDeptMapper.java

@@ -135,7 +135,8 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
         wrapper.select(SysDept::getDeptId)
             .inSql(SysDept::getDeptId, this.buildDeptByRoleSql(roleId))
             .orderByAsc(SysDept::getParentId)
-            .orderByAsc(SysDept::getOrderNum);
+            .orderByAsc(SysDept::getOrderNum)
+            .orderByAsc(SysDept::getDeptId);
         if (deptCheckStrictly) {
             wrapper.notInSql(SysDept::getDeptId, this.buildParentDeptByRoleSql(roleId));
         }

src/main/java/org/dromara/system/mapper/SysDictDataMapper.java

@@ -24,6 +24,7 @@ public interface SysDictDataMapper extends BaseMapperPlus<SysDictData, SysDictDa
         return selectVoList(
             new LambdaQueryWrapper<SysDictData>()
                 .eq(SysDictData::getDictType, dictType)
-                .orderByAsc(SysDictData::getDictSort));
+                .orderByAsc(SysDictData::getDictSort)
+                .orderByAsc(SysDictData::getDictCode));
     }
 }

src/main/java/org/dromara/system/mapper/SysMenuMapper.java

@@ -154,7 +154,8 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
                 .in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU)
                 .eq(SysMenu::getStatus, SystemConstants.NORMAL)
                 .orderByAsc(SysMenu::getParentId)
-                .orderByAsc(SysMenu::getOrderNum);
+                .orderByAsc(SysMenu::getOrderNum)
+                .orderByAsc(SysMenu::getMenuId);
         return this.selectList(lqw);
     }
 
@@ -170,7 +171,8 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
         wrapper.select(SysMenu::getMenuId)
                 .inSql(SysMenu::getMenuId, buildMenuByRoleSql(roleId))
                 .orderByAsc(SysMenu::getParentId)
-                .orderByAsc(SysMenu::getOrderNum);
+                .orderByAsc(SysMenu::getOrderNum)
+                .orderByAsc(SysMenu::getMenuId);
         if (menuCheckStrictly) {
             wrapper.notInSql(SysMenu::getMenuId, this.buildParentMenuByRoleSql(roleId));
         }

src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java

@@ -90,7 +90,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
                         .eq(ObjectUtil.isNotNull(menu.getParentId()), SysMenu::getParentId, menu.getParentId())
                         .eq(StringUtils.isNotBlank(menu.getIsSystem()), SysMenu::getIsSystem, menu.getIsSystem())
                         .orderByAsc(SysMenu::getParentId)
-                        .orderByAsc(SysMenu::getOrderNum));
+                        .orderByAsc(SysMenu::getOrderNum)
+                        .orderByAsc(SysMenu::getMenuId));
         return menuList;
     }
 
@@ -120,7 +121,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
                         .eq(ObjectUtil.isNotNull(menu.getParentId()), SysMenu::getParentId, menu.getParentId())
                         .eq(SysMenu::getIsSystem, 0)
                         .orderByAsc(SysMenu::getParentId)
-                        .orderByAsc(SysMenu::getOrderNum));
+                        .orderByAsc(SysMenu::getOrderNum)
+                        .orderByAsc(SysMenu::getMenuId));
         return menuList;
     }
 
@@ -199,7 +201,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
                             .eq(SysMenu::getStatus, SystemConstants.NORMAL)
                             .inSql(SysMenu::getMenuId, baseMapper.buildMenuByUserSql(userId))
                             .orderByAsc(SysMenu::getParentId)
-                            .orderByAsc(SysMenu::getOrderNum));
+                            .orderByAsc(SysMenu::getOrderNum)
+                            .orderByAsc(SysMenu::getMenuId));
         }
         return getChildPerms(menus, Constants.TOP_PARENT_ID);
     }
@@ -224,7 +227,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
                             .eq(SysMenu::getStatus, SystemConstants.NORMAL)
                             .inSql(SysMenu::getMenuId, baseMapper.buildMenuByUserSql(userId, companyId, loginPort))
                             .orderByAsc(SysMenu::getParentId)
-                            .orderByAsc(SysMenu::getOrderNum));
+                            .orderByAsc(SysMenu::getOrderNum)
+                            .orderByAsc(SysMenu::getMenuId));
         }
         return getChildPerms(menus, Constants.TOP_PARENT_ID);
     }

src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java

@@ -91,7 +91,8 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
             .eq(StringUtils.isNotBlank(bo.getStatus()), SysPost::getStatus, bo.getStatus())
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 SysPost::getCreateTime, params.get("beginTime"), params.get("endTime"))
-            .orderByAsc(SysPost::getPostSort);
+            .orderByAsc(SysPost::getPostSort)
+            .orderByAsc(SysPost::getPostId);
         if (ObjectUtil.isNotNull(bo.getDeptId())) {
             //优先单部门搜索
             wrapper.eq(SysPost::getDeptId, bo.getDeptId());

src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java

@@ -96,7 +96,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
                 .like(StringUtils.isNotBlank(bo.getRoleKey()), SysRole::getRoleKey, bo.getRoleKey())
                 .between(params.get("beginTime") != null && params.get("endTime") != null,
                         SysRole::getCreateTime, params.get("beginTime"), params.get("endTime"))
-                .orderByAsc(SysRole::getRoleSort).orderByAsc(SysRole::getCreateTime);
+                .orderByAsc(SysRole::getRoleSort).orderByAsc(SysRole::getCreateTime).orderByAsc(SysRole::getRoleId);
         return wrapper;
     }
 

src/main/java/org/dromara/web/controller/AuthController.java

@@ -213,7 +213,7 @@ public class AuthController {
             lqw.eq(HotCompanySafetyManager::getUserId, loginUser.getUserId());
             lqw.eq(HotCompanySafetyManager::getStatus, 1L);
             lqw.eq(HotCompanySafetyManager::getIsResigned, 0L);
-            lqw.orderByDesc(HotCompanySafetyManager::getCreateTime);
+            lqw.orderByDesc(HotCompanySafetyManager::getCreateTime, HotCompanySafetyManager::getId);
             lqw.last("limit 1");
 
             HotCompanySafetyManager manager = hotCompanySafetyManagerMapper.selectOne(lqw);
@@ -231,7 +231,7 @@ public class AuthController {
                 lqw.eq(HotDriver::getCompanyId, selectedRole.getCompanyId());
                 lqw.eq(HotDriver::getStatus, 1L);
                 lqw.eq(HotDriver::getAuditStatus, 1);
-                lqw.orderByDesc(HotDriver::getCreateTime);
+                lqw.orderByDesc(HotDriver::getCreateTime, HotDriver::getId);
                 lqw.last("limit 1");
 
                 HotDriver driver = hotDriverMapper.selectOne(lqw);

src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java

@@ -328,7 +328,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
             lqw.eq(HotCompanySafetyManager::getUserId, loginUser.getUserId());
             lqw.eq(HotCompanySafetyManager::getStatus, 1L);
             lqw.eq(HotCompanySafetyManager::getIsResigned, 0L);
-            lqw.orderByDesc(HotCompanySafetyManager::getCreateTime);
+            lqw.orderByDesc(HotCompanySafetyManager::getCreateTime, HotCompanySafetyManager::getId);
             lqw.last("limit 1");
 
             HotCompanySafetyManager manager = hotCompanySafetyManagerMapper.selectOne(lqw);
@@ -344,7 +344,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
                 lqw.eq(HotDriver::getPhone, sysUser.getPhonenumber());
                 lqw.eq(HotDriver::getCompanyId, selectedRole.getCompanyId());
                 lqw.eq(HotDriver::getStatus, 1L);
-                lqw.orderByDesc(HotDriver::getCreateTime);
+                lqw.orderByDesc(HotDriver::getCreateTime, HotDriver::getId);
                 lqw.last("limit 1");
 
                 HotDriver driver = hotDriverMapper.selectOne(lqw);

src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java

@@ -144,7 +144,7 @@ public class SmsAuthStrategy implements IAuthStrategy {
             lqw.eq(HotCompanySafetyManager::getUserId, loginUser.getUserId());
             lqw.eq(HotCompanySafetyManager::getStatus, 1L);
             lqw.eq(HotCompanySafetyManager::getIsResigned, 0L);
-            lqw.orderByDesc(HotCompanySafetyManager::getCreateTime);
+            lqw.orderByDesc(HotCompanySafetyManager::getCreateTime, HotCompanySafetyManager::getId);
             lqw.last("limit 1");
             HotCompanySafetyManager manager = hotCompanySafetyManagerMapper.selectOne(lqw);
             if (manager != null) {
@@ -158,7 +158,7 @@ public class SmsAuthStrategy implements IAuthStrategy {
                 lqw.eq(HotDriver::getPhone, sysUser.getPhonenumber());
                 lqw.eq(HotDriver::getCompanyId, selectedRole.getCompanyId());
                 lqw.eq(HotDriver::getStatus, 1L);
-                lqw.orderByDesc(HotDriver::getCreateTime);
+                lqw.orderByDesc(HotDriver::getCreateTime, HotDriver::getId);
                 lqw.last("limit 1");
                 HotDriver driver = hotDriverMapper.selectOne(lqw);
                 if (driver != null) {

src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java

@@ -266,7 +266,7 @@ public class FlwChartExtServiceImpl implements ChartExtService {
         LambdaQueryWrapper<FlowHisTask> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(FlowHisTask::getInstanceId, instanceId)
             .eq(FlowHisTask::getNodeType, NodeType.BETWEEN.getKey())
-            .orderByDesc(FlowHisTask::getUpdateTime);
+            .orderByDesc(FlowHisTask::getUpdateTime, FlowHisTask::getId);
         return flowHisTaskMapper.selectList(wrapper);
     }
 

src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java

@@ -106,7 +106,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
             List<Long> categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowDefinition.getCategory()));
             wrapper.in(FlowDefinition::getCategory, StreamUtils.toList(categoryIds, Convert::toStr));
         }
-        wrapper.orderByDesc(FlowDefinition::getCreateTime);
+        wrapper.orderByDesc(FlowDefinition::getCreateTime, FlowDefinition::getId);
         return wrapper;
     }
 

src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java

@@ -140,7 +140,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
         queryWrapper.eq(StringUtils.isNotBlank(flowInstanceBo.getBusinessId()), "fi.business_id", flowInstanceBo.getBusinessId());
         queryWrapper.in(CollUtil.isNotEmpty(flowInstanceBo.getCreateByIds()), "fi.create_by", flowInstanceBo.getCreateByIds());
         queryWrapper.eq("fi.del_flag", "0");
-        queryWrapper.orderByDesc("fi.create_time");
+        queryWrapper.orderByDesc("fi.create_time").orderByDesc("fi.id");
         return queryWrapper;
     }
 
@@ -367,7 +367,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
             new LambdaQueryWrapper<FlowHisTask>()
                 .eq(FlowHisTask::getInstanceId, instanceId)
                 .eq(FlowHisTask::getNodeType, NodeType.BETWEEN.getKey())
-                .orderByDesc(FlowHisTask::getUpdateTime)
+                .orderByDesc(FlowHisTask::getUpdateTime, FlowHisTask::getId)
         );
         if (CollUtil.isNotEmpty(hisTasks)) {
             hisTaskVos = BeanUtil.copyToList(hisTasks, FlowHisTaskVo.class);

src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@@ -456,7 +456,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
             List<Long> categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowTaskBo.getCategory()));
             wrapper.in("t.category", StreamUtils.toList(categoryIds, Convert::toStr));
         }
-        wrapper.orderByDesc("t.create_time").orderByDesc("t.update_time");
+        wrapper.orderByDesc("t.create_time").orderByDesc("t.update_time").orderByDesc("t.id");
         return wrapper;
     }
 

src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@@ -96,7 +96,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
         lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), TestLeave::getLeaveType, bo.getLeaveType());
         lqw.ge(bo.getStartLeaveDays() != null, TestLeave::getLeaveDays, bo.getStartLeaveDays());
         lqw.le(bo.getEndLeaveDays() != null, TestLeave::getLeaveDays, bo.getEndLeaveDays());
-        lqw.orderByDesc(BaseEntity::getCreateTime);
+        lqw.orderByDesc(BaseEntity::getCreateTime, TestLeave::getId);
         return lqw;
     }