From aa1bdb548aa6a6371a8953efacc3986300eee576 Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Fri, 15 Nov 2024 08:50:23 +0800
Subject: [PATCH] fix:补充提交
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 37132e2..6d10b52 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -291,12 +291,10 @@
queryWrapper.eq("monitor_point_id", mpId);
}
- //������������������������
- queryWrapper.eq("is_delete", Constants.NOT_DELETE);
//���������������mac������������
if (name != null && mac != null) {
- queryWrapper.like("name", name).or().like("mac", mac);
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE).like("name", name).or().like("mac", mac);
}
//������������,������create_time������
@@ -309,6 +307,8 @@
} else {
queryWrapper.orderByDesc("create_time");
}
+ //������������������������
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
Page<Device> devicePage = new Page<>(page, size);
deviceMapper.selectPage(devicePage, queryWrapper);
--
Gitblit v1.8.0