From 271e42176c49a3679991f8c9e30f2ce192b87eaa Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 18 十二月 2021 18:19:34 +0800 Subject: [PATCH] !126 自动生成代码未引入此依赖 import com.baomidou.mybatisplus.extension.plugins.pag Merge pull request !126 from 抓蛙师/auto-7465549-dev-1639814849312 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index 728bfd0..0591780 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.RedisUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysUserOnline; @@ -53,7 +52,7 @@ if (StringUtils.equals(ipaddr, user.getIpaddr())) { userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user)); } - } else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) { + } else if (StringUtils.isNotEmpty(userName)) { if (StringUtils.equals(userName, user.getUsername())) { userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user)); } @@ -63,7 +62,7 @@ } Collections.reverse(userOnlineList); userOnlineList.removeAll(Collections.singleton(null)); - return PageUtils.buildDataInfo(userOnlineList); + return TableDataInfo.build(userOnlineList); } /** -- Gitblit v1.9.3