From edade5a0933d5abf784e8a86785bb5d0b9c5a8ac Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 17 十月 2022 21:33:17 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
index a428b3f..2527140 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
@@ -49,8 +49,8 @@
.eq(StringUtils.isNotBlank(logQueryParams.getPortEquipment()), UmsAdminLoginLog::getUserAgent, logQueryParams.getPortEquipment())
.eq(logQueryParams.getId() != null, UmsAdminLoginLog::getAdminId, logQueryParams.getId())
.between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
- .orderBy(logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
- .orderBy(logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime));
+ .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
+ .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime));
List<UmsAdminLogVO> umsAdminLogVOList = page.getRecords().stream()
.map(item -> {
UmsAdminLogVO umsAdminlogVO = new UmsAdminLogVO();
@@ -114,8 +114,8 @@
.like(StringUtils.isNotBlank(logQueryParams.getContent()), UmsAdminLoginLog::getContain, logQueryParams.getContent())
.eq(StringUtils.isNotBlank(logQueryParams.getOperationType()), UmsAdminLoginLog::getOperationType, logQueryParams.getOperationType())
.between(logQueryParams.getStartTime() != null && logQueryParams.getEndTime() != null, UmsAdminLoginLog::getCreateTime, logQueryParams.getStartTime(), logQueryParams.getEndTime())
- .orderBy(logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
- .orderBy(logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime))
+ .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 0, true, UmsAdminLoginLog::getCreateTime)
+ .orderBy(logQueryParams.getSort() != null && logQueryParams.getSort() == 1, false, UmsAdminLoginLog::getCreateTime))
.getRecords()
.stream()
.map(item -> {
--
Gitblit v1.8.0