值班管理按sort排序

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,