From cfdeada3fdb415ea451fb3fb76b96a2e7977752c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 11:21:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
index ff5d47d..45ed439 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
@@ -3,7 +3,7 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysLogininfor;
@@ -22,7 +22,7 @@
* @author ruoyi
*/
@Service
-public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
+public class SysLogininforServiceImpl extends ServicePlusImpl<SysLogininforMapper, SysLogininfor, SysLogininfor> implements ISysLogininforService {
@Override
public TableDataInfo<SysLogininfor> selectPageLogininforList(SysLogininfor logininfor) {
@@ -36,9 +36,8 @@
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d')",
- params.get("endTime"))
- .orderByDesc(SysLogininfor::getInfoId);
- return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
+ params.get("endTime"));
+ return PageUtils.buildDataInfo(page(PageUtils.buildPage("info_id","desc"), lqw));
}
/**
--
Gitblit v1.9.3