From 0c4507ad5ebdbf8ac1c2bbcdcf38203908e61378 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java
index 463b2c0..1091ade 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java
@@ -17,7 +17,6 @@
import doumeemes.dao.ext.DeviceCheckExtMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import io.lettuce.core.dynamic.annotation.Param;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -63,6 +62,12 @@
List<DeviceCheckExtListVO> result = deviceCheckExtMapper.selectList(pageWrap.getModel());
return PageData.from(new PageInfo<>(result));
}
+ @Override
+ public PageData<DeviceCheckExtListVO> getDeviceCheckPage (PageWrap<QueryDeviceCheckExtDTO> pageWrap) {
+ PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
+ List<DeviceCheckExtListVO> result = deviceCheckExtMapper.selectList(pageWrap.getModel());
+ return PageData.from(new PageInfo<>(result));
+ }
@Override
public DeviceCheck selectOneById(Integer id){
--
Gitblit v1.9.3