From 5d795a0c15a13b801c6c03a254d010c954ffd357 Mon Sep 17 00:00:00 2001
From: laishajiang <12977614+laishajiang@user.noreply.gitee.com>
Date: Wed, 13 Mar 2024 19:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E7=AE=A1=E7=90=86=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/biutag/lan/service/FavoriteService.java  | 3 ---
 mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml | 7 +++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/FavoriteService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/FavoriteService.java
index 480b148..195010b 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/service/FavoriteService.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/service/FavoriteService.java
@@ -42,9 +42,6 @@ public class FavoriteService extends ServiceImpl<FavoriteMapper, Favorite> {
                 case "name":
                     queryWrapper.like("f.contact_name", mailQuery.getContactFieldValue());
                     break;
-                case "idCard":
-                    queryWrapper.like("f.contactIdCard", mailQuery.getContactFieldValue());
-                    break;
                 case "phone":
                     queryWrapper.like("f.contact_phone", mailQuery.getContactFieldValue());
                     break;
diff --git a/mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml b/mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml
index f1a58df..07101fe 100644
--- a/mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml
+++ b/mailbox-lan/src/main/resources/mapper/DataScreenMapper.xml
@@ -178,17 +178,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     limit 1
     </select>
     <select id="getToDayDuty" resultType="com.biutag.entity.system.Duty">
-        select a.* from duty a
+        select distinct on (a.depart_id, a.emp_no) a.* from duty a
         inner join dept b on a.depart_id=b.id where
-        now()  BETWEEN  a.start_time and   a.end_time
+        now()  BETWEEN  a.start_time and   (to_date(a.end_time) + interval '1 D')
         <if test="depatType!=null and depatType!=''">
        and   a.dept_type=#{depatType}
         </if>
         <if test="deptId!=null and deptId!=''">
             and   b.pid=#{deptId}
         </if>
-          order by a.create_time desc
-
+          order by a.depart_id desc
     </select>
     <select id="mapCountyData" resultType="java.util.Map" parameterType="java.lang.String">
         select d.name, a.id,