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/CrmInterfaceLogServiceImpl.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
index acbd595..4189d77 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
@@ -5,6 +5,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CrmInterfaceLogMapper;
import com.doumee.dao.business.model.CrmInterfaceLog;
+import com.doumee.dao.business.model.IamInterfaceLog;
import com.doumee.service.business.CrmInterfaceLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -119,8 +120,7 @@
queryWrapper.lambda().eq(CrmInterfaceLog::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getUrl() != null) {
- queryWrapper.lambda().ge(CrmInterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl()));
- queryWrapper.lambda().le(CrmInterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl()));
+ queryWrapper.lambda().like(CrmInterfaceLog::getUrl, pageWrap.getModel().getUrl());
}
if (pageWrap.getModel().getRequest() != null) {
queryWrapper.lambda().eq(CrmInterfaceLog::getRequest, pageWrap.getModel().getRequest());
@@ -140,13 +140,7 @@
if (pageWrap.getModel().getObjId() != null) {
queryWrapper.lambda().eq(CrmInterfaceLog::getObjId, pageWrap.getModel().getObjId());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByDesc(CrmInterfaceLog::getCreateDate);
return PageData.from(crmInterfaceLogMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3