From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
index 3246f07..3e0e68b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
@@ -43,7 +43,9 @@
}
if (null!=smsResult.getIsExport()){
// 导出，不分页
- return baseMapper.selectSmsResultPage(null,smsResult,list);
+ List<SmsResultVO> resultVOList = baseMapper.selectSmsResultPage(null, smsResult, list);
+ // 设置统计值
+ return resultVOList;
}
// 查询返回
return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult,list));
--
Gitblit v1.9.3