From 80c2decba4f1cedf07514299d826d4902bf30b83 Mon Sep 17 00:00:00 2001
From: Ziin <hiziying@hotmail.com>
Date: Tue, 8 Jul 2025 18:23:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=20orderby=20=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/bigbrother/BigBrotherMapper.xml | 2 +-
 .../employeebigbrother/EmployeeBigBrotherMapper.xml       | 4 ++--
 .../mapper/employeehosts/EmployeeHostsMapper.xml          | 8 ++++----
 .../src/main/resources/mapper/newhosts/NewHostsMapper.xml | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml
index 80d61c2..f074d33 100644
--- a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml
@@ -96,7 +96,7 @@
             <choose>
                 <!-- 传空和默认的情况下按照时间降序排序  -->
                 <when test="dto.sortName == '' or dto.sortName == null">
-                    sbr.create_time  desc
+                    sbr.create_time  desc,sbr.id
                 </when>
                 <!-- sortNmae 有值的情况下排序  -->
                 <when test="dto.sortName != null and dto.sort != null ">
diff --git a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
index 71d52b0..4e72433 100644
--- a/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/employeebigbrother/EmployeeBigBrotherMapper.xml
@@ -97,7 +97,7 @@
         <choose>
             <!-- 传空和默认的情况下按照时间降序排序  -->
             <when test="dto.sortName == '' or dto.sortName == null">
-                sbr.create_time  desc
+                sbr.create_time  desc,sbr.id
             </when>
             <!-- sortNmae 有值的情况下排序  -->
             <when test="dto.sortName != null and dto.sort != null ">
@@ -185,7 +185,7 @@
             <choose>
                 <!-- 传空和默认的情况下按照时间降序排序  -->
                 <when test="dto.sortName == '' or dto.sortName == null">
-                    sbr.create_time  desc
+                    sbr.create_time  desc,sbr.id
                 </when>
                 <!-- sortNmae 有值的情况下排序  -->
                 <when test="dto.sortName != null and dto.sort != null ">
diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
index eeb08b0..76019c2 100644
--- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
@@ -145,8 +145,8 @@
         order by
         <choose>
             <!-- 传空和默认的情况下按照时间降序排序  -->
-            <when test="req.sortName == '' and req.sortName == null">
-                ns.create_time  desc
+            <when test="req.sortName == '' or req.sortName == null">
+                ns.create_time  desc,ns.id
             </when>
             <!-- sortNmae 有值的情况下排序  -->
             <when test="req.sortName != null and req.sort != null ">
@@ -268,8 +268,8 @@
         order by
         <choose>
             <!-- 传空和默认的情况下按照时间降序排序  -->
-            <when test="req.sortName == '' and req.sortName == null">
-                ns.create_time  desc
+            <when test="req.sortName == '' or req.sortName == null">
+                ns.create_time  desc,ns.id
             </when>
             <!-- sortNmae 有值的情况下排序  -->
             <when test="req.sortName != null and req.sort != null ">
diff --git a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml
index d6a71f9..a4f2712 100644
--- a/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/newhosts/NewHostsMapper.xml
@@ -100,7 +100,7 @@
         <choose>
             <!-- 传空和默认的情况下按照时间降序排序 -->
             <when test="req.sortName == null or req.sortName == ''">
-                ns.create_time desc
+                ns.create_time desc,ns.id
             </when>
             <!-- sortName 有值的情况下排序 -->
             <when test="req.sortName != null and req.sort != null">