diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 47a927a49..fabbac3af 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1564,17 +1564,17 @@ public class AppUserServiceImpl implements AppUserService { @Override public Result npmUserRegister(EpdcUserNpmRegisterFormDTO formDto) { - UserDTO userDTO = generateUserDTO(formDto,true); + UserDTO userDTO = generateUserDTO(formDto); return userFeignClient.nmpUserRegister(userDTO); } @Override public Result 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 adminDeptResult = adminFeignClient.getCompleteDept(deptId);