|
|
@ -819,6 +819,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
userEntity.setWxOpenId(StringUtils.isBlank(userEntity.getWxOpenId()) ? null : userEntity.getWxOpenId()); |
|
|
|
userEntity.setWxUnionId(StringUtils.isBlank(userEntity.getWxUnionId()) ? null : userEntity.getWxUnionId()); |
|
|
|
userEntity.setFaceImg(StringUtils.isBlank(userEntity.getFaceImg()) ? null : userEntity.getFaceImg()); |
|
|
|
userEntity.setIdentityNo(findUser.getIdentityNo()); |
|
|
|
// 只进行认证居民操作
|
|
|
|
userEntity.setPartyFlag(YesOrNoEnum.NO.value()); |
|
|
|
//返回网格长标识信息
|
|
|
@ -846,7 +847,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
UserDTO userDto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); |
|
|
|
userDto.setLeaderFlag(relationInfo.getLeaderFlag()); |
|
|
|
userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? findUser.getFaceImg() : userDto.getFaceImg()); |
|
|
|
userDto.setIdentityNo(findUser.getIdentityNo()); |
|
|
|
return userDto; |
|
|
|
} |
|
|
|
|
|
|
|