From 04ca758eb14fa39e50aea551ad646980d5e604f8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 27 Jan 2026 11:19:00 +0800
Subject: [PATCH] 导出优化

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 7de7022..59f748f 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
@@ -29,10 +29,18 @@
 
 
     <select id="selectGdDataObjectionPage" resultMap="gdDataObjectionResultMap">
-        select do.*, GROUP_CONCAT(da.attach_name SEPARATOR ',') as attach_names
-        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,
+            bd.dept_name as create_dept_name
+        from
+            ja_gd_data_objection do
+        left join
+            ja_gd_data_objection_attachment da
+            on do.id = da.objection_id
+        left join blade_dept bd on bd.id = do.create_dept
         <where>
+                do.is_deleted = 0
             <if test="param2.title != null and param2.title != ''">
                 and do.title like concat('%',#{param2.title},'%')
             </if>

--
Gitblit v1.9.3