From 54beb665319b66742cdec3dffb7e298701d61582 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 07 Nov 2023 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 238bf81..959ae30 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -199,7 +199,7 @@
<if test="organizationId !=null">
AND organization_id = #{organizationId}
</if>
- and mac LIKE "%"#{mac}"%" AND is_delete = 0
+ and mac LIKE "%"#{mac}"%" or `name` like "%"#{mac}"%" AND is_delete = 0
union
SELECT sd.id,sd.`name`,sd.mac,sd.special_type FROM special_device as sd
WHERE 1=1
--
Gitblit v1.8.0