Browse Source

1、修复个人信息无法修改党员标示的问题;

2、增加未知账号错误的返回;
master
luyan 1 year ago
parent
commit
6c0735f2f4
  1. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  2. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java

4
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()); return this.getTokenByUserDto(userInfoResult.getData());
} }
private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(CachingUserInfoDTO userDto){ private Result<EpdcAppAuthorizationDTO> getTokenByUserDto(CachingUserInfoDTO userDto) {
EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO(); EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO();
// 用户未注册 // 用户未注册
if (null == userDto) { if (null == userDto) {
@ -278,7 +278,7 @@ public class AppUserServiceImpl implements AppUserService {
formDTO.setPassword(loginDto.getPassword()); formDTO.setPassword(loginDto.getPassword());
Result<CachingUserInfoDTO> userInfoResult = userFeignClient.npmNeedCachingUserInfo(formDTO); Result<CachingUserInfoDTO> userInfoResult = userFeignClient.npmNeedCachingUserInfo(formDTO);
if (!userInfoResult.success()) { if (!userInfoResult.success()) {
return new Result().error(userInfoResult.getMsg()); return new Result().error(-1, "请确认账号和密码是否正确或联系管理员!");
} }
return this.getTokenByNpmUserDto(userInfoResult.getData(), loginDto); return this.getTokenByNpmUserDto(userInfoResult.getData(), loginDto);
} }

2
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 * 是否党员 0 1
*/ */
private Integer partyFlag; private String partyFlag;
/** /**
* 所属行业其他 * 所属行业其他

Loading…
Cancel
Save