From 6c0735f2f4df88928cbfd8e988cf6aad2415a01d Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 26 Mar 2024 10:33:11 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E5=85=9A?=
 =?UTF-8?q?=E5=91=98=E6=A0=87=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?=202=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9C=AA=E7=9F=A5=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E9=94=99=E8=AF=AF=E7=9A=84=E8=BF=94=E5=9B=9E=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java  | 4 ++--
 .../epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java   | 2 +-
 2 files changed, 3 insertions(+), 3 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 5ffa46958..e1f7c405f 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
@@ -249,7 +249,7 @@ public class AppUserServiceImpl implements AppUserService {
         return this.getTokenByUserDto(userInfoResult.getData());
     }
 
-    private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(CachingUserInfoDTO userDto){
+    private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(CachingUserInfoDTO userDto) {
         EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO();
         // 用户未注册
         if (null == userDto) {
@@ -278,7 +278,7 @@ public class AppUserServiceImpl implements AppUserService {
         formDTO.setPassword(loginDto.getPassword());
         Result<CachingUserInfoDTO> userInfoResult = userFeignClient.npmNeedCachingUserInfo(formDTO);
         if (!userInfoResult.success()) {
-            return new Result().error(userInfoResult.getMsg());
+            return new Result().error(-1, "请确认账号和密码是否正确或联系管理员！");
         }
         return this.getTokenByNpmUserDto(userInfoResult.getData(), loginDto);
     }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java
index 6821cc458..ff05b3dbc 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java
@@ -85,7 +85,7 @@ public class EpdcUserNpmRegisterFormDTO implements Serializable {
     /**
      * 是否党员 0、否  1、是
      */
-    private Integer partyFlag;
+    private String partyFlag;
 
     /**
      * 所属行业（其他）