From 9f8f73240c885488fdffc1062826520cf7abb86b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 17:45:03 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index d8f0dea..316c627 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -600,15 +600,19 @@
List<StructureTestObject> testObjects = new ArrayList<>();
for (FactoryDto factoryDto : list) {
for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
- List<SampleTypeDto> children = laboratoryDto.getChildren();
- int sort = 0;
- // 寰幆绗笁灞�
- for (SampleTypeDto child : children) {
- StructureTestObject structureTestObject = new StructureTestObject();
- structureTestObject.setSort(sort);
- structureTestObject.setId(child.getSampleTypeId());
- testObjects.add(structureTestObject);
- sort++;
+ for (ObjectTypeDto objectTypeDto : laboratoryDto.getChildren()) {
+ for (WorkShopNameDto workShopNameDto:objectTypeDto.getChildren()) {
+ List<SampleTypeDto> children = workShopNameDto.getChildren();
+ int sort = 0;
+
+ for (SampleTypeDto child : children) {
+ StructureTestObject structureTestObject = new StructureTestObject();
+ structureTestObject.setSort(sort);
+ structureTestObject.setId(child.getSampleTypeId());
+ testObjects.add(structureTestObject);
+ sort++;
+ }
+ }
}
}
}
--
Gitblit v1.9.3