建议bug修复

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());

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