From b1ae62872b40272c9b5c56b6f5f0baf1d648cf91 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 19 Apr 2021 11:57:42 +0800
Subject: [PATCH] user_log,字典表实体类修改
---
screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..cb0a8ee 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
@@ -13,6 +13,7 @@
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;
@@ -41,9 +42,9 @@
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