From b4cfd0f3448b48a2e57bf53a5ba0d12fea58fde9 Mon Sep 17 00:00:00 2001
From: laishajiang <12977614+laishajiang@user.noreply.gitee.com>
Date: Fri, 15 Mar 2024 15:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E7=AE=A1=E7=90=86=E6=8C=89so?=
 =?UTF-8?q?rt=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml b/mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml
index 07101fe..d833f52 100644
--- a/mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml
+++ b/mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml
@@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     limit 1
     </select>
     <select id="getToDayDuty" resultType="com.biutag.entity.system.Duty">
-        select distinct on (a.depart_id, a.emp_no) a.* from duty a
+        select distinct on (a.depart_id, a.emp_no,b.sort) a.* from duty a
         inner join dept b on a.depart_id=b.id where
         now()  BETWEEN  a.start_time and   (to_date(a.end_time) + interval '1 D')
         <if test="depatType!=null and depatType!=''">
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="deptId!=null and deptId!=''">
             and   b.pid=#{deptId}
         </if>
-          order by a.depart_id desc
+          order by b.sort asc
     </select>
     <select id="mapCountyData" resultType="java.util.Map" parameterType="java.lang.String">
         select d.name, a.id,