From ac7d3f46480406f09221e0612bb9fbb72b86cbb0 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Sat, 16 May 2020 20:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8F=E8=A7=88=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/co/yixiang/logging/service/impl/LogServiceImpl.java  | 4 +---
 .../java/co/yixiang/logging/service/mapper/LogMapper.java     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java b/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java
index e0283962..ceab876a 100644
--- a/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java
+++ b/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java
@@ -58,9 +58,7 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.loggin
     @Override
     public Object findAllByPageable(String nickname, Pageable pageable) {
         getPage(pageable);
-        List<co.yixiang.logging.domain.Log> list  = logMapper.findAllByPageable(nickname);
-        PageInfo<co.yixiang.logging.domain.Log> page = new PageInfo<>(list);
-
+        PageInfo<co.yixiang.logging.domain.Log> page = new PageInfo<>(logMapper.findAllByPageable(nickname));
         Map<String,Object> map = new LinkedHashMap<>(2);
         map.put("content",page.getList());
         map.put("totalElements",page.getTotal());
diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java b/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java
index 113fe23d..79c9045b 100644
--- a/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java
+++ b/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java
@@ -29,7 +29,7 @@ public interface LogMapper extends CoreMapper<Log> {
     void deleteByLogType(@Param("logType") String logType);
     @Select("<script>select l.id,l.create_time as createTime,l.description, l.request_ip as requestIp,l.address,u.nickname from log l  " +
             " left join yx_user u on u.uid=l.uid where l.type=1 " +
-            " <if test = \"nickname !=''\"> and u.nickname LIKE CONCAT('%',#{nickname},'%')</if> order by l.id desc</script>")
+            " <if test = \"nickname !=null\"> and u.nickname LIKE CONCAT('%',#{nickname},'%')</if> order by l.id desc</script>")
     List<Log> findAllByPageable(@Param("nickname") String nickname);
     @Select( "select count(*) FROM (select request_ip FROM log where create_time between #{date1} and #{date2} GROUP BY request_ip) as s")
     long findIp(@Param("date1") String date1, @Param("date2")String date2);