From d1081f1c022023253a9ff68c2d60a09422e7179f Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 29 Jan 2026 15:43:14 +0800
Subject: [PATCH] 数据异议优化

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
index 141a444..c77890f 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
@@ -37,11 +37,12 @@
             ja_gd_data_objection do
         left join
                 ja_gd_data_objection_attachment da
-                on do.id = da.objection_id
+                on do.id = da.objection_id and da.is_deleted = 0
         left join
                 blade_dept bd on bd.id = do.create_dept
         <where>
                 do.is_deleted = 0
+                and da.is_deleted = 0
             <if test="param2.title != null and param2.title != ''">
                 and do.title like concat('%',#{param2.title},'%')
             </if>
@@ -64,10 +65,16 @@
     </select>
 
     <select id="getDetail" resultType="org.sxkj.gd.orderdata.vo.GdDataObjectionVO">
-        select do.*, GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names ,GROUP_CONCAT(da.attach_id SEPARATOR ',') as attach_ids
-        from ja_gd_data_objection do
-        left join ja_gd_data_objection_attachment da on do.id = da.objection_id
+        select
+            do.*,
+            GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names ,
+            GROUP_CONCAT(da.attach_id SEPARATOR ',') as attach_ids
+        from
+            ja_gd_data_objection do
+        left join
+                ja_gd_data_objection_attachment da on do.id = da.objection_id
         <where>
+                and da.is_deleted = 0
             <if test="id != null ">
                 and do.id = #{id}
             </if>

--
Gitblit v1.9.3