From cbaff53b2c82cfaa7ad8cb22f5a33a1b7caecd7c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 25 九月 2025 10:06:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/api/view/pr/Api1207PR.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1207PR.java b/src/main/java/com/fzzy/api/view/pr/Api1207PR.java
index 93f72c5..c3e31a0 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1207PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1207PR.java
@@ -86,12 +86,12 @@
predicates.add(predicate2);
}
if (null != param.getStart()) {
- Predicate predicate3 = cb.greaterThan(root.get("jssj"), ContextUtil.getCurZero(param.getStart()));
+ Predicate predicate3 = cb.greaterThan(root.get("dcrq"), ContextUtil.getCurZero(param.getStart()));
predicates.add(predicate3);
}
if (null != param.getEnd()) {
- Predicate predicate4 = cb.lessThan(root.get("jssj"), ContextUtil.getNextZero(param.getEnd()));
+ Predicate predicate4 = cb.lessThan(root.get("dcrq"), ContextUtil.getNextZero(param.getEnd()));
predicates.add(predicate4);
}
return cb.and(predicates.toArray(new Predicate[0]));
@@ -174,9 +174,6 @@
ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
- if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
- return pushDataList(items, apiService, apiConf);
- }
return pushDataSingle(items, apiService, apiConf);
}
--
Gitblit v1.9.3