glj-代码提交

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;
 

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>
 

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},
+        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.code = #{userVo.country}
+                                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>