From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
index 93202cc..94dc21a 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
@@ -36,6 +36,7 @@
LambdaQueryWrapper<EquipmentPoint> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(EquipmentPoint::getEquipmentPoint, equipmentPoint.getEquipmentPoint());
wrapper.eq(EquipmentPoint::getState, 1);
+ wrapper.eq(EquipmentPoint::getInstrumentId, equipmentPoint.getInstrumentId());
wrapper.select(EquipmentPoint::getEquipmentPoint);
EquipmentPoint equipmentPoint1 = equipmentPointMapper.selectOne(wrapper);
if (ObjectUtils.isEmpty(equipmentPoint1)){
--
Gitblit v1.9.3