From 157b41110607ef7ff0a5a43394f95be96d496602 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Tue, 30 Jan 2024 11:19:51 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kening/vordm/entity/DataUpload.java      | 2 ++
 .../src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml | 3 ++-
 .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
index 95ac2d9..1fd5642 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
@@ -27,4 +27,6 @@ public class DataUpload extends EntityData{
 	private String vordmId;
 
 	private String geometry;
+
+	private String uploaderEmail;
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml
index 7cc30fe..6aab239 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml
@@ -42,7 +42,8 @@
             ed.status,ed.uploader_id,ed.manager_id,
             ed.review_time, ed.source_organization,
             ed.upload_type,
-            bu.name as uploaderName
+            bu.name as uploaderName,
+            bu.email as uploaderEmail
         from entity_data ed
         left join blade_user bu on bu.id = ed.uploader_id
         <where>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index a1aae37..a7ebf3d 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -887,6 +887,7 @@
             gmdr.manager_id = #{userId}
         </where>
     </select>
+
     <select id="getUserDisasterInfoListNDRNew" resultType="com.kening.vordm.entity.DisasterInfo">
         select
         <include refid="Base_Column_List"/>