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 | 5 +++--
1 files changed, 3 insertions(+), 2 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 c0ba3ff..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)){
@@ -45,8 +46,8 @@
}
@Override
- public List<Map<String, Object>> getListEquipmentPointInformation() {
- return equipmentPointMapper.getListEquipmentPointInformation();
+ public List<Map<String, Object>> getListEquipmentPointInformation(String InstrumentId) {
+ return equipmentPointMapper.getListEquipmentPointInformation(InstrumentId);
}
@Override
--
Gitblit v1.9.3