From 877c4c9fbc1dc819743c78b0084f391a2de5bd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?=
 <14281818+xue-hongxiang@user.noreply.gitee.com>
Date: Tue, 17 Dec 2024 17:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=AE=9E=E9=AA=8C=E5=AE=A4id?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/contraller/DeviceController.java          | 1 +
 .../org/springblade/modules/business/pojo/dto/DeviceDTO.java   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/org/springblade/modules/business/contraller/DeviceController.java b/src/main/java/org/springblade/modules/business/contraller/DeviceController.java
index f28c369..6d200f0 100644
--- a/src/main/java/org/springblade/modules/business/contraller/DeviceController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/DeviceController.java
@@ -87,6 +87,7 @@ public class DeviceController extends BladeController {
         wrapper.eq(StringUtils.isNotBlank(device.getType()), Device::getType, device.getType());
         wrapper.like(StringUtils.isNotBlank(device.getBrand()), Device::getBrand, device.getBrand());
         wrapper.like(StringUtils.isNotBlank(device.getSupplier()), Device::getSupplier, device.getSupplier());
+        wrapper.eq(device.getLimsId() != null, Device::getLimsId, device.getLimsId());
         wrapper.eq(device.getRunStatus() != null, Device::getRunStatus, device.getRunStatus());
 //		wrapper.eq(Device::getCreateUser, AuthUtil.getUserId());
         wrapper.orderByDesc(Device::getCreateTime);
diff --git a/src/main/java/org/springblade/modules/business/pojo/dto/DeviceDTO.java b/src/main/java/org/springblade/modules/business/pojo/dto/DeviceDTO.java
index 4942ecd..cf7e25f 100644
--- a/src/main/java/org/springblade/modules/business/pojo/dto/DeviceDTO.java
+++ b/src/main/java/org/springblade/modules/business/pojo/dto/DeviceDTO.java
@@ -44,5 +44,8 @@ public class DeviceDTO extends Device {
     //状态
     private Integer runStatus;
 
+    //实验室id
+    private Long limsId;
+
 
 }