From 32ba5ac318edf01cccc7b4d8827c4c1dc9c90f30 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 04 三月 2025 10:08:43 +0800
Subject: [PATCH] Merge branch 'dev' into dev_dz
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
index 3487fc2..7c28152 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.DeviceMaintenanceService;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -27,14 +28,13 @@
@Override
public IPage<DeviceMaintenance> getDeviceMaintenancePage(Page page, Integer deviceId, String deviceNumber) {
- return baseMapper.selectPage(page, Wrappers.<DeviceMaintenance>lambdaQuery()
+ if (ObjectUtils.isEmpty(deviceNumber)){
+ return baseMapper.selectPage(page, Wrappers.<DeviceMaintenance>lambdaQuery()
+ .eq(DeviceMaintenance::getDeviceId, deviceId));
+ }
+ else return baseMapper.selectPage(page, Wrappers.<DeviceMaintenance>lambdaQuery()
.eq(DeviceMaintenance::getDeviceId, deviceId)
.like(DeviceMaintenance::getDeviceNumber, deviceNumber));
- }
-
- @Override
- public List<DeviceMaintenanceExport> deviceMaintenanceExport(Integer deviceId) {
- return baseMapper.deviceMaintenanceExport(deviceId);
}
@Override
--
Gitblit v1.9.3