From 512aedf30aacbb753af131dd091aa021ff696a8c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 16:44:30 +0800
Subject: [PATCH] opt: sql改造其他模块改造12

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
index bb6d1e5..3c443c7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
@@ -73,6 +73,7 @@
         on md.device_sn::text = d2.device_sn::text
         and d2.device_type = '0'
         <where>
+             md.is_deleted = 0
             <if test="deviceIds != null and deviceIds.size() > 0">
                 and md.id::text in
                 <foreach item="item" collection="deviceIds" index="index" open="(" close=")" separator=",">
@@ -89,8 +90,6 @@
             <if test="deviceType != null and deviceType != '' ">
                 and md.device_type::text = #{deviceType}::text
             </if>
-            /* 将固定条件放在最前面或最后面,确保逻辑严健 */
-            and md.is_deleted = 0
         </where>
     </select>
 

--
Gitblit v1.9.3