From f6e7379fbfbba4f6667944a2be62f99461bf97f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 六月 2024 16:14:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
index 232fe1c..df770da 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.BushingDto;
-import com.yuanchu.mom.dto.FiberDto;
import com.yuanchu.mom.dto.FibersDto;
import com.yuanchu.mom.mapper.InsBushingMapper;
import com.yuanchu.mom.pojo.InsBushing;
@@ -44,17 +43,18 @@
if(bushingDto.getFiber().size()==0){
bushingDto.setFibers(insBushingMapper.selectFibersByBushingId(insBushing.getId()));
for (FibersDto fibers : bushingDto.getFibers()) {
- getTemplateThing(fibers.getProductList());
+// getTemplateThing(fibers.getProductList());
fibers.setFiber(insBushingMapper.selectFiberByFibersId(fibers.getId()));
- for (FiberDto fiberDto : fibers.getFiber()) {
- getTemplateThing(fiberDto.getProductList());
- }
- }
- }else{
- for (FiberDto fiberDto : bushingDto.getFiber()) {
- getTemplateThing(fiberDto.getProductList());
+// for (FiberDto fiberDto : fibers.getFiber()) {
+// getTemplateThing(fiberDto.getProductList());
+// }
}
}
+// else{
+// for (FiberDto fiberDto : bushingDto.getFiber()) {
+// getTemplateThing(fiberDto.getProductList());
+// }
+// }
bushingDtos.add(bushingDto);
}
return bushingDtos;
--
Gitblit v1.9.3