From dfaf7c908dfd78ff95af7848de411ca7d02a3c70 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 16 Aug 2023 09:20:52 +0800
Subject: [PATCH] feat:页面组织增加在线状态
---
screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
index 61e14ef..a0fc827 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
@@ -10,13 +10,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
+import java.util.List;
import java.util.Map;
-import java.util.Objects;
-
-import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -34,16 +30,14 @@
@Override
public Page<UserLog> selectLogs(Map<String, Object> parameters) {
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- String token = request.getHeader("token");
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
Object orgId = orgInfo.get("id");
QueryWrapper<UserLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("organization_id", orgId);
- Object type = parameters.get("type");
- if (type != null) {
- queryWrapper.eq("type", type);
+ List<Object> types = (List<Object>) parameters.get("types");
+ if (!types.isEmpty()) {
+ queryWrapper.in("type", types);
}
queryWrapper.orderByDesc("create_time");
Integer page = (Integer) parameters.get("page");
--
Gitblit v1.8.0