From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51: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/handler/AtomItemHandler.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/AtomItemHandler.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/AtomItemHandler.java
index 76b80d4..5c2f392 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/AtomItemHandler.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/handler/AtomItemHandler.java
@@ -7,6 +7,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
@@ -27,10 +28,15 @@
private IndItemValueService indItemValueService;
public List<IndItemValueVO> queryValue(String itemId) {
- List<IndItemValueVO> result = new ArrayList<IndItemValueVO>();
+ List<IndItemValueVO> result = new ArrayList<>();
try {
QuerySourceValueDTO queryDto = indSqlUtils.getAtomSql(itemId);
- return indItemValueService.getSourceValue(queryDto);
+ result = indItemValueService.getSourceValue(queryDto);
+ if (!CollectionUtils.isEmpty(result)) {
+ result.forEach(item -> {
+ item.setItemNo(queryDto.getItemNo());
+ });
+ }
} catch (Exception ex) {
ex.printStackTrace();
}
--
Gitblit v1.9.3