From 367a9bc72043bae667438a0c59c708afca48dec6 Mon Sep 17 00:00:00 2001
From: glj <13935964706@163.com>
Date: Wed, 13 Mar 2024 18:16:22 +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/EntityData.java  | 3 +++
 .../src/main/java/com/kening/vordm/entity/OtherData.java   | 4 ++++
 .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml    | 2 +-
 .../main/java/com/kening/vordm/mapper/EntityDataMapper.xml | 7 +++----
 .../kening/vordm/service/impl/OtherDataServiceImpl.java    | 7 +++++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
index 92ce543..c74e972 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
@@ -123,6 +123,9 @@ public class EntityData implements Serializable {
 
 	private String password;
 
+	//来源路径  方便查看信息来源
+	private String sourceLink;
+
 	/**
 	 * 上传人姓名
 	 */
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
index 889ce2b..649ae28 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
@@ -27,4 +27,8 @@ public class OtherData{
 	private Integer visualFlag;
 
 	private String sourceOrganization;
+
+	private String sourceLink;
+
+	private Long userId;
 }
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 549eb45..5254f34 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
@@ -885,7 +885,7 @@
         LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
         <where>
             gmdr.manager_id = #{userId}
-            and di.respond_status > 1
+            and di.respond_status = 2
         </where>
     </select>
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
index e714d56..ac6bf50 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
@@ -27,12 +27,11 @@
         <result property="isDownload" column="is_download" jdbcType="INTEGER"/>
         <result property="account" column="account" jdbcType="VARCHAR"/>
         <result property="password" column="password" jdbcType="VARCHAR"/>
+        <result property="sourceLink" column="source_link" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        ed
-        .
-        id
+        ed.id
         ,ed.title,ed.size,
         ed.type,ed.link,ed.remark,
         ed.upload_time,ed.disaster_id,ed.visual_flag,
@@ -40,7 +39,7 @@
         ed.status,ed.uploader_id,ed.manager_id,
         ed.review_time, ed.source_organization,
         ed.upload_type, ed.is_deleted, ed.is_publish,
-        ed.is_download, ed.account, ed.password
+        ed.is_download, ed.account, ed.password, ed.source_link
     </sql>
 
     <select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
index 73059ac..7138f8f 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
@@ -116,11 +116,14 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
 		entityData.setTitle(OtherData.getTitle());
 		entityData.setStatus(1);
 		entityData.setUploadType(2);
-		entityData.setUploaderId(AuthUtil.getUserId());
-		entityData.setManagerId(AuthUtil.getUserId());
+		entityData.setUploaderId(OtherData.getUserId());
+		entityData.setManagerId(OtherData.getUserId());
 		entityData.setReviewTime(new Date());
 		entityData.setVisualFlag(OtherData.getVisualFlag());
 		entityData.setSourceOrganization(OtherData.getSourceOrganization());
+		if (OtherData.getSourceLink()!=null){
+			entityData.setSourceLink(OtherData.getSourceLink());
+		}
 		return save(entityData);
 	}