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 gmdr.manager_id = #{userId} + and di.respond_status > 1 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 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} @@ -54,8 +54,9 @@