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 getTokenByUserDto(CachingUserInfoDTO userDto){ + private Result getTokenByUserDto(CachingUserInfoDTO userDto) { EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO(); // 用户未注册 if (null == userDto) { @@ -278,7 +278,7 @@ public class AppUserServiceImpl implements AppUserService { formDTO.setPassword(loginDto.getPassword()); Result 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; /** * 所属行业(其他)