From 60e0c3ed00e0ae34e3129c9179a9da091bbaaca5 Mon Sep 17 00:00:00 2001
From: glj <13935964706@163.com>
Date: Wed, 28 Feb 2024 11:31:40 +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/vo/UserVo.java          | 5 +++++
 .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml    | 1 +
 .../main/java/com/kening/vordm/mapper/GuestInfoMapper.xml  | 7 ++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
index 51ce028..177a95d 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
@@ -87,6 +87,11 @@ public class UserVo {
 	 */
 	private String roleId;
 
+	private String lastName;
+
+
+	private String firstName;
+
 	//国家
 	private String country;
 
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 f4bed40..549eb45 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,6 +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
         </where>
     </select>
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
index 50cf050..98b2561 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
@@ -28,8 +28,8 @@
     </update>
 
     <update id="updateAccount">
-        update blade_user t set t.name = #{userVo.name}, t.real_name = #{userVo.realName}, t.organization = #{userVo.organization},
-                                t.research_field = #{userVo.researchField}, t.occupation = #{userVo.occupation}, t.code = #{userVo.country}
+        update blade_user t set t.name = #{userVo.name}, t.real_name = #{userVo.realName}, t.last_name = #{userVo.lastName}, t.first_name = #{userVo.firstName}, t.organization = #{userVo.organization},
+                                t.research_field = #{userVo.researchField}, t.occupation = #{userVo.occupation}, t.country = #{userVo.country}
         where t.id = #{userVo.id}
     </update>
 
@@ -54,8 +54,9 @@
     <select id="getByUserStatisticsTwo" resultType="java.lang.Integer">
         select count(di.id)
         FROM disaster_info di
+        LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
         <where>
-            di.chief_id = #{userId}
+            gmdr.manager_id = #{userId}
             and di.respond_status > 1
         </where>
     </select>