From 51738f72dbf50863919ff1c93de6507789fd35d9 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Thu, 19 Nov 2020 13:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=AE=AEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/UserAdviceServiceImpl.java     | 8 ++++----
 .../src/main/resources/mapper/UserAdviceDao.xml           | 2 +-
 2 files changed, 5 insertions(+), 5 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 d7b1a19bd9..46a5e96c95 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
@@ -256,11 +256,11 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), "CUSTOMER_ID", dto.getCustomerId());
         //是否回复
         if ("1".equals(dto.getIsReply())) {
-            wrapper.ne("REPLY_USER_ID", "");
-            wrapper.ne("REPLY_CONTENT", "");
+            wrapper.isNotNull("REPLY_USER_ID");
+            wrapper.isNotNull("REPLY_CONTENT");
         } else if ("0".equals(dto.getIsReply())) {
-            wrapper.eq("REPLY_USER_ID", "");
-            wrapper.eq("REPLY_CONTENT", "");
+            wrapper.isNull("REPLY_USER_ID");
+            wrapper.isNull("REPLY_CONTENT");
         }
         //建议类型
         wrapper.like(StringUtils.isNotBlank(dto.getAdviceType()), "ADVICE_TYPE", dto.getAdviceType());
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml
index 1499c9581b..2687060be4 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml
@@ -56,7 +56,7 @@
     </resultMap>
 
     <select id="myAdviceList" resultMap="myAdviceListResultMap">
-        select id,advice_type,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
+        select id,advice_type,advice_content,advice_time,reply_content,reply_time
         from user_advice
         where del_flag = 0 and user_id = #{userId}
         order by created_time desc