From 01c480e06f1a486298485be5ecaac769d55b6e28 Mon Sep 17 00:00:00 2001
From: wyj2080 <1603068044@qq.com>
Date: Mon, 20 Apr 2020 11:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A6=82=E8=A7=88=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kiisoo/ic/customer/service/CustomerViewService.java   | 2 +-
 src/main/resources/mapper/OpCustomerDOMapper.xml              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
index ebfef11..641fe91 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -96,7 +96,7 @@ public class CustomerViewService {
         //会员总数
         Long vipCount = opVipDOMapper.selectVipCount(shopIds, null, null);
 
-        //柱状图list
+        //设置柱状图list
         List<OpCustomer> validCustomerList = customerList.stream().filter(customerDO -> VALID.equals(customerDO.getValidType())).collect(Collectors.toList());
         customerViewVO.setCustomerList(customerList);
         customerViewVO.setValidCustomerList(validCustomerList);
diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml
index b9a2bd4..07802cb 100644
--- a/src/main/resources/mapper/OpCustomerDOMapper.xml
+++ b/src/main/resources/mapper/OpCustomerDOMapper.xml
@@ -92,10 +92,10 @@
         <if test="type != null">
             and t2.type = #{type}
         </if>
-        <if test="startDate != null">
+        <if test="startDate != null and startDate != ''">
             and t2.create_time <![CDATA[ >= ]]> #{startDate}
         </if>
-        <if test="endDate != null">
+        <if test="endDate != null and endDate != ''">
             and t2.create_time <![CDATA[ <= ]]> #{endDate}
         </if>
     </select>