From d27a23905e97333004bf5104adabd87db9b60b54 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Sun, 31 May 2020 15:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=92=8C=E5=A5=BD=E5=8F=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/kiisoo/ic/customer/CustomerService.java | 4 ++++
 .../resources/mapper/OpSellerCustomerRelationDOMapper.xml | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index de1703d..4df293d 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -670,6 +670,10 @@ public class CustomerService {
 //        PageHelper.startPage(pageNum, pageSize);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<FriendDTO> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum,pageSize);
 
+        if(startDate.getTime() == endDate.getTime()){
+            endDate = null;
+        }
+
         if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
             // 0、新增好友  1、累计好友
             if (flag == 0) {
diff --git a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
index e1de24d..c90fcf2 100644
--- a/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
+++ b/src/main/resources/mapper/OpSellerCustomerRelationDOMapper.xml
@@ -37,10 +37,10 @@
             CONCAT('%',#{search},'%'))
         </if>
         <if test="startDate != null">
-            and date(t1.create_time) &gt;= #{startDate}
+            and t1.create_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            and date(t1.create_time) &lt;= #{endDate}
+            and t1.create_time &lt;= #{endDate}
         </if>
         order by t1.create_time desc
     </select>
@@ -79,10 +79,10 @@
             CONCAT('%',#{search},'%'))
         </if>
         <if test="startDate != null">
-            and date(t1.create_time) &gt;= #{startDate}
+            and t1.create_time &gt;= #{startDate}
         </if>
         <if test="endDate != null">
-            and date(t1.create_time) &lt;= #{endDate}
+            and t1.create_time &lt;= #{endDate}
         </if>
         order by t1.create_time desc
     </select>