|
|
|
@ -887,6 +887,10 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
dto.setVolunteerNickname(volunteerInfoDTO.getData().getVolunteerNickname()); |
|
|
|
dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); |
|
|
|
dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce()); |
|
|
|
// 如果用户表的身份证号为空,则尝试使用志愿者表中的身份证
|
|
|
|
if (null == dto.getIdentityNo()) { |
|
|
|
dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (("0").equals(result.getData().getState())) { |
|
|
|
dto.setGridId(tokenDto.getGridId()); |
|
|
|
|