From 476fe0148a48cfad552742d2f25668af2945e692 Mon Sep 17 00:00:00 2001
From: gaofan <goafan17862815802@163.com>
Date: Tue, 11 Jul 2023 18:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=A0=B9=E6=8D=AEopenId?=
 =?UTF-8?q?=E6=9F=A5=E5=87=BA=E5=A4=9A=E6=9D=A1=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/AppUserServiceImpl.java  | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

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<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);