From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.java
index fc5a5bd..96f10e5 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.java
@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.IamInterfaceLogMapper;
+import com.doumee.dao.business.model.CustomerLog;
import com.doumee.dao.business.model.IamInterfaceLog;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.service.business.IamInterfaceLogService;
@@ -116,18 +117,17 @@
if (pageWrap.getModel().getType() != null) {
queryWrapper.lambda().eq(IamInterfaceLog::getType, pageWrap.getModel().getType());
}
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(IamInterfaceLog::getName, pageWrap.getModel().getName());
- }
if (pageWrap.getModel().getUrl() != null) {
- queryWrapper.lambda().ge(IamInterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl()));
- queryWrapper.lambda().le(IamInterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl()));
+ queryWrapper.lambda().like(IamInterfaceLog::getUrl, pageWrap.getModel().getUrl());
+ }
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().like(IamInterfaceLog::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getRequest() != null) {
- queryWrapper.lambda().eq(IamInterfaceLog::getRequest, pageWrap.getModel().getRequest());
+ queryWrapper.lambda().like(IamInterfaceLog::getRequest, pageWrap.getModel().getRequest());
}
if (pageWrap.getModel().getRepose() != null) {
- queryWrapper.lambda().eq(IamInterfaceLog::getRepose, pageWrap.getModel().getRepose());
+ queryWrapper.lambda().like(IamInterfaceLog::getRepose, pageWrap.getModel().getRepose());
}
if (pageWrap.getModel().getSuccess() != null) {
queryWrapper.lambda().eq(IamInterfaceLog::getSuccess, pageWrap.getModel().getSuccess());
@@ -147,13 +147,7 @@
if (pageWrap.getModel().getQueryEndDate() != null) {
queryWrapper.lambda().le(IamInterfaceLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getQueryEndDate()));
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByDesc(IamInterfaceLog::getCreateDate);
return PageData.from(iamInterfaceLogMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3