From 5c2fc8b317e17d0b194f27937bd9d2af8961502f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 24 一月 2025 15:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java
index 2abeda0..d8b98fb 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java
@@ -48,10 +48,10 @@
                 result = atomItemHandler.queryValue(indItem.getId());
                 break;
             case DER:
-                result = derItemHandler.queryValue(itemNo);
+                result = derItemHandler.queryValue(indItem.getId());
                 break;
             case CAL:
-                result = calItemHandler.queryValue(itemNo);
+                result = calItemHandler.queryValue(indItem.getId());
                 break;
             default:
                 break;
@@ -71,10 +71,10 @@
                 result = atomItemHandler.queryValue(indItem.getId());
                 break;
             case DER:
-                result = derItemHandler.queryValue(itemNo, startTime, endTime);
+                result = derItemHandler.queryValue(indItem.getId(), startTime, endTime);
                 break;
             case CAL:
-                result = calItemHandler.queryValue(itemNo, startTime, endTime);
+                result = calItemHandler.queryValue(indItem.getId(), startTime, endTime);
                 break;
             default:
                 break;

--
Gitblit v1.9.3