|
|
|
@ -1564,17 +1564,17 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<EpdcAppRegisterCallbackDTO> npmUserRegister(EpdcUserNpmRegisterFormDTO formDto) { |
|
|
|
UserDTO userDTO = generateUserDTO(formDto,true); |
|
|
|
UserDTO userDTO = generateUserDTO(formDto); |
|
|
|
return userFeignClient.nmpUserRegister(userDTO); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<String> npmUserUpdate(EpdcUserNpmRegisterFormDTO formDto) { |
|
|
|
UserDTO userDTO = generateUserDTO(formDto,false); |
|
|
|
UserDTO userDTO = generateUserDTO(formDto); |
|
|
|
return userFeignClient.npmUserUpdate(userDTO); |
|
|
|
} |
|
|
|
|
|
|
|
private UserDTO generateUserDTO(EpdcUserNpmRegisterFormDTO formDto,boolean isRegister){ |
|
|
|
private UserDTO generateUserDTO(EpdcUserNpmRegisterFormDTO formDto){ |
|
|
|
EpdcUserRegistFormDTO epdcUserRegistFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcUserRegistFormDTO.class); |
|
|
|
epdcUserRegistFormDTO.setRoad(""); |
|
|
|
|
|
|
|
@ -1588,12 +1588,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
deptId = user.getDeptId(); |
|
|
|
} |
|
|
|
|
|
|
|
WxMaJscode2SessionResult nmpWxUser ; |
|
|
|
if (isRegister){ |
|
|
|
nmpWxUser = this.getNMPWxUser(formDto.getWxCode()); |
|
|
|
}else{ |
|
|
|
nmpWxUser = new WxMaJscode2SessionResult(); |
|
|
|
} |
|
|
|
WxMaJscode2SessionResult nmpWxUser = this.getNMPWxUser(formDto.getWxCode()); |
|
|
|
|
|
|
|
// 获取网格机构详情
|
|
|
|
Result<CompleteDeptDTO> adminDeptResult = adminFeignClient.getCompleteDept(deptId); |
|
|
|
|