From 0c4507ad5ebdbf8ac1c2bbcdcf38203908e61378 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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