From 74a6454275dc8539b0369b67e7914633d47a9253 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 02 八月 2022 09:32:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
index 1fbb073..15e84d3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
@@ -4,6 +4,7 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -61,7 +62,7 @@
/**
* 鏌ヨ澶ф皵鏁版嵁(妯＄硦鏌ヨ)
*/
- public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
+ public CommonPage listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<Long> listAirId;
if (SecurityUtils.getClientId() == null) {
@@ -69,11 +70,13 @@
} else {
listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
}
+ CommonPage commonPage = CommonPage.restPage(listAirId);
if (CollUtil.isEmpty(listAirId)) {
- return CollUtil.newArrayList();
+ return commonPage;
}
List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
- return airDataBos;
+ commonPage.setList(airDataBos);
+ return commonPage;
}
@@ -91,6 +94,7 @@
}
+
/**
* +
* 鏍规嵁鐏潌id鏌ヨ澶ф皵鏁版嵁
--
Gitblit v1.9.3