From df7684221a6b30edccd985e32952e2959fff65ce Mon Sep 17 00:00:00 2001 From: lxw <810412026@qq.com> Date: 星期二, 17 十月 2023 14:41:17 +0800 Subject: [PATCH] 23 --- src/main/java/com/whyc/util/SubTablePageInfoUtils.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java index 8fe0b8f..53b0dfe 100644 --- a/src/main/java/com/whyc/util/SubTablePageInfoUtils.java +++ b/src/main/java/com/whyc/util/SubTablePageInfoUtils.java @@ -246,7 +246,8 @@ data.setLimitStart(limitList.get(0)); data.setLimitEnd(limitList.get(1)); data.setRecordYear(recordYear); - List<AlarmRes> list = devAlarmDataHistoryMapper.getListForInterface(data); + //List<AlarmRes> list = devAlarmDataHistoryMapper.getListForInterface(data); + List list = subService.getListForInterface_dev(data); dataList.addAll(list); } } @@ -488,7 +489,8 @@ data.setLimitStart(limitList.get(0)); data.setLimitEnd(limitList.get(1)); data.setRecordYear(recordYear); - List<AlarmRes> list = devAlarmDataHistoryMapper.getListForInterface(data); + //List<AlarmRes> list = devAlarmDataHistoryMapper.getListForInterface(data); + List list = subService.getListForInterface_dev(data); dataList.addAll(list); } } -- Gitblit v1.9.1