From 379222715511cc4d6efd4abbbb3463f5485f590d Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 11 三月 2025 10:27:30 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceServiceImpl.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceServiceImpl.java
index 8fd1281..33550cf 100644
--- a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceServiceImpl.java
@@ -76,11 +76,7 @@
@Override
public IPage<DeviceDto> selectDeviceParameter(Page page, DeviceDto itemParameter, Boolean laboratoryNameIsNull) {
- itemParameter.setCreateUser(SecurityUtils.getUserId().intValue());
- String storagePoint = itemParameter.getStoragePoint();//瀛樻斁鐐�
- itemParameter.setStoragePoint(null);
- QueryWrapper<DeviceDto> wrapper = QueryWrappers.queryWrappers(itemParameter).eq(StringUtils.isNotBlank(storagePoint), "storage_point", storagePoint);
- IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, wrapper, laboratoryNameIsNull);
+ IPage<DeviceDto> iPage = deviceMapper.selectDeviceParameterPage(page, QueryWrappers.queryWrappers(itemParameter), laboratoryNameIsNull);
return iPage;
}
--
Gitblit v1.9.3