From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3

---
 server/src/main/resources/mappers/DeviceCheckExtMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/src/main/resources/mappers/DeviceCheckExtMapper.xml b/server/src/main/resources/mappers/DeviceCheckExtMapper.xml
index fbd4d89..294959b 100644
--- a/server/src/main/resources/mappers/DeviceCheckExtMapper.xml
+++ b/server/src/main/resources/mappers/DeviceCheckExtMapper.xml
@@ -33,7 +33,7 @@
         left join device d on `deviceCheck`.DEVICE_ID = d.id
         left join procedures p on p.id =  d.PROCEDURE_ID
         left join `system_user` s on s.id = `deviceCheck`.CREATE_USER
-    <where>
+    <where> deviceCheck.deleted=0
       <if test="deviceName != null and deviceName != ''">
         AND d.NAME like concat('%',#{deviceName},'%')
       </if>

--
Gitblit v1.9.3