From d141cb3496255e33d04e0dcaee3519cf70240719 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 01 九月 2023 17:10:00 +0800
Subject: [PATCH] 修改bug

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index 37cfb30..0e54519 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -247,7 +247,6 @@
         queryWrapper
                 .eq(InspectionProduct::getInspectionMaterialId, inspectionMaterial.getId());
         List<InspectionProduct> inspectionProducts = inspectionProductMapper.selectList(queryWrapper);
-        System.out.println(inspectionProducts);
         //杩欓噷鏌ュ埌鐨勮澶噄d鍜屾楠屽憳id瑕佹煡璇㈠悕绉�
         List<InsProductVo> insProductVos = inspectionProducts.stream().map(insProduct -> {
             //灏嗕竴涓璞$殑鍊艰祴鍊肩粰鍙︿竴涓璞�
@@ -255,13 +254,11 @@
             BeanUtils.copyProperties(insProduct, insProductVo);
             //鑾峰彇璁惧鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
             if (insProduct.getInstrumentId() != null) {
-                String equipmentName = instrumentService.getById(insProduct.getInstrumentId()).getEquipmentName();
-                insProductVo.setInstrumentName(equipmentName);
+                insProductVo.setInstrumentId(insProduct.getInstrumentId());
             }
             //鑾峰彇鐢ㄦ埛鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
             if (insProduct.getUserProId() != null) {
-                String userName = userMapper.selectById(insProduct.getUserProId()).getName();
-                insProductVo.setUserName(userName);
+                insProductVo.setUserId(insProduct.getUserProId());
             }
             //椤圭洰鍏宠仈鐗╂枡id
             insProductVo.setInspectionMaterialId(inspectionMaterial.getId());

--
Gitblit v1.9.3