From 9a156c3e20c9dd5c1215bd5dfec5677388777749 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 26 Oct 2023 14:53:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index f394f1e..ead9eb8 100644
--- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
@@ -251,7 +251,10 @@
on
d.`device_version_id` = oua.`version_id` and d.`organization_id` = oua.`organization_id` and oua.`is_delete` = 0
where
- d.`is_delete` = 0;
+ d.`is_delete` = 0
+ <if test="mac != null and mac != '' ">
+ and d.mac = #{mac}
+ </if>
</select>
--
Gitblit v1.8.0