lbqms.git - Gitblit

			@@ -3,11 +3,12 @@
			import cn.hutool.http.useragent.UserAgent;
			import cn.hutool.http.useragent.UserAgentUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.common.constant.Constants;
			import com.ruoyi.common.core.domain.PageQuery;
			import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.core.service.LogininforService;
			import com.ruoyi.common.utils.PageUtils;
			import com.ruoyi.common.utils.ServletUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.ip.AddressUtils;
			@@ -87,7 +88,7 @@
			}

			@Override
			public TableDataInfo<SysLogininfor> selectPageLogininforList(SysLogininfor logininfor) {
			public TableDataInfo<SysLogininfor> selectPageLogininforList(SysLogininfor logininfor, PageQuery pageQuery) {
			Map<String, Object> params = logininfor.getParams();
			LambdaQueryWrapper<SysLogininfor> lqw = new LambdaQueryWrapper<SysLogininfor>()
			.like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr())
			@@ -95,7 +96,11 @@
			.like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName())
			.between(params.get("beginTime") != null && params.get("endTime") != null,
			SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime"));
			return PageUtils.buildDataInfo(page(PageUtils.buildPage("info_id", "desc"), lqw));
			if(StringUtils.isBlank(pageQuery.getOrderByColumn())) {
			pageQuery.setOrderByColumn("info_id").setIsAsc("desc");
			}
			Page<SysLogininfor> page = page(pageQuery.build(), lqw);
			return TableDataInfo.build(page);
			}

			/**