From f628be11a131a262855908b7815c3027d6bafb4c Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期三, 03 二月 2021 09:35:23 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/services/Batt_devalarm_data_historyService.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fgkj/services/Batt_devalarm_data_historyService.java b/src/main/java/com/fgkj/services/Batt_devalarm_data_historyService.java
index 671e5ed..2b3222d 100644
--- a/src/main/java/com/fgkj/services/Batt_devalarm_data_historyService.java
+++ b/src/main/java/com/fgkj/services/Batt_devalarm_data_historyService.java
@@ -47,15 +47,14 @@
//3.4璁惧鍛婅鍘嗗彶璁板綍鏌ヨ
public ServiceModel serchByCondition(Batt_Maint_Dealarm bmd) {
ServiceModel model = new ServiceModel();
-
PageBean pageBean = bmd.getPageBean();
- PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);
- List list=mapper.serchByCondition(bmd);
- PageInfo<Batt_Maint_Dealarm> pageInfo = new PageInfo<>(list);
-
- model.setCode(1);
- model.setData(pageInfo);
-
+ PageHelper.startPage(pageBean.getPageNum(), pageBean.getPageSize(), true);
+ List<Batt_Maint_Dealarm> list = mapper.serchByCondition(bmd);
+ if (null != list && list.size() > 0) {
+ PageInfo<Batt_Maint_Dealarm> pageInfo = new PageInfo<>(list);
+ model.setCode(1);
+ model.setData(pageInfo);
+ }
return model;
}
}
--
Gitblit v1.9.1