From 08be20dea42c393adea5ad098a9ef9d6ee2d5e71 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 10 Oct 2024 14:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=99=8D=E5=BA=8F=E6=8E=92?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/TbBdRecordMapper.xml       | 1 +
 .../src/main/resources/mapper/base/TbDevAttributeMapper.xml   | 1 +
 .../src/main/resources/mapper/base/TbPeopleMapper.xml         | 4 +---
 .../src/main/resources/mapper/base/TbProDepartMapper.xml      | 1 +
 .../src/main/resources/mapper/base/TbProjectMapper.xml        | 1 +
 .../src/main/resources/mapper/base/TbWarnConfigMapper.xml     | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml
index a24d996..0666f90 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml
@@ -50,6 +50,7 @@
       and DATE_FORMAT(tbr.create_time, '%Y-%m-%d') = #{applyTime}
     </if>
     GROUP BY tbr.id
+    ORDER BY tbr.create_time DESC
   </select>
 
   <select id="selectByName" resultType="com.bonus.base.domain.TbBdRecord">
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml
index 5424f91..5053500 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml
@@ -56,6 +56,7 @@
     <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
       <![CDATA[and tddr.create_time BETWEEN #{startTime} AND #{endTime} ]]>
     </if>
+    ORDER BY tddr.create_time DESC
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml
index 4628560..f6c3539 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml
@@ -31,7 +31,7 @@
         <if test="isAll != null and isAll == 0">
             and (tp.team_id is null and tp.id not in (select rel_id from tb_team where del_flag = '0' and rel_id is not null and js_time is null))
         </if>
-        ORDER BY CASE WHEN tp.id = tt.rel_id THEN 0 ELSE 1 END, tp.id
+        ORDER BY tp.create_time DESC, CASE WHEN tp.id = tt.rel_id THEN 0 ELSE 1 END, tp.id
     </select>
 
     <select id="queryById" resultType="com.bonus.base.domain.TbPeople">
@@ -53,10 +53,8 @@
                tp.rel_phone   as relPhone,
                tp.id_card     as idCard,
                tp.post_code   as postCode,
-               sda.dict_label as postName,
                tp.sex         as sex
         from tb_people tp
-                 left join sys_dict_data sda on tp.post_code = sda.dict_code
         where tp.del_flag = '0'
         <if test="idCard != null and idCard != ''">
             and tp.id_card = #{idCard}
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml
index e182687..13c44fc 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProDepartMapper.xml
@@ -31,6 +31,7 @@
         <if test="headUser != null and headUser != ''">
             and tpd.head_user like concat('%',#{headUser},'%')
         </if>
+        ORDER BY tpd.create_time DESC
     </select>
 
     <!--查询单个-->
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml
index 3893b1b..b1e7c75 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProjectMapper.xml
@@ -49,6 +49,7 @@
             and tb.depart_id = #{departId}
         </if>
         GROUP BY tb.id
+        ORDER BY tb.create_time DESC
     </select>
 
     <select id="queryById" resultType="com.bonus.base.vo.TbProjectVo">
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbWarnConfigMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbWarnConfigMapper.xml
index 79586da..dab896e 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbWarnConfigMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbWarnConfigMapper.xml
@@ -410,6 +410,7 @@
     <if test="configName != null and configName != ''">
       and twc.config_name like concat('%',#{configName},'%')
     </if>
+    ORDER BY twc.create_time DESC
   </select>
     <select id="queryByDeviceId" resultType="java.lang.Integer">
       select count(1) from tb_device