From 8bf27bf76b09892f0207a604d7f02cec024e031b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 28 十二月 2021 11:24:34 +0800
Subject: [PATCH] !127 add 新增数据脱敏注解，可根据菜单权限字符控制是否脱敏 Merge pull request !127 from Yjoioooo/auto-5403234-dev-1640272112776
---
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