From 3aa6dd178b4847a79d8b61564e495639119d1824 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Tue, 24 Nov 2020 15:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=88=97=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserAdviceServiceImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
index 2d741ae1bc..75036c7b1b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
@@ -253,6 +253,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         //wrapper
         QueryWrapper<UserAdviceEntity> wrapper = new QueryWrapper<>();
         //del_flag
+
         wrapper.eq("DEL_FLAG","0");
         //客户Id
         wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), "CUSTOMER_ID", dto.getCustomerId());
@@ -268,9 +269,9 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         wrapper.like(StringUtils.isNotBlank(dto.getAdviceType()), "ADVICE_TYPE", dto.getAdviceType());
 
         //开始时间
-        wrapper.ge(dto.getStartTime() != null, "CREATED_TIME", dto.getStartTime());
+        wrapper.ge(StringUtils.isNotBlank(dto.getStartTime()), "CREATED_TIME", dto.getStartTime());
         //结束时间
-        wrapper.le(dto.getEndTime() != null, "CREATED_TIME", dto.getEndTime());
+        wrapper.le(StringUtils.isNotBlank(dto.getEndTime()), "CREATED_TIME", dto.getEndTime());
         // 组织id
         if (StringUtils.isNotBlank(dto.getAgencyId())){
             wrapper.and(wrapper1 ->wrapper1.eq("AGENCY_ID", dto.getAgencyId())