Browse Source

Merge remote-tracking branch 'origin/hotfix/heart_bug'

feature/dangjian
李鹏飞 5 years ago
parent
commit
fef467bfb7
  1. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

@ -60,7 +60,7 @@ public class ApiActUserRelationController {
Result isVolunteer = appUserService.getVolunteerCountById(tokenDto); Result isVolunteer = appUserService.getVolunteerCountById(tokenDto);
int code = isVolunteer.getCode(); int code = isVolunteer.getCode();
if (code != 0) { if (code != 0) {
//不是志愿者 // 不是志愿者
return isVolunteer; return isVolunteer;
} }
Result<EpdcUserInfoResultDTO> userInfo = appUserService.getInfoById(tokenDto); Result<EpdcUserInfoResultDTO> userInfo = appUserService.getInfoById(tokenDto);
@ -76,14 +76,8 @@ public class ApiActUserRelationController {
} else { } else {
actUserRelationDTO.setPartyFlag(YesOrNoEnum.NO.value()); actUserRelationDTO.setPartyFlag(YesOrNoEnum.NO.value());
} }
String identityNo = epdcUserInfoResultDTO.getIdentityNo(); String identityNo = epdcUserInfoResultDTO.getIdentityNo();
if (StringUtils.isEmpty(identityNo)) {
// 身份证号码为空,需要重新认证志愿者
isVolunteer.setData(0);
return isVolunteer;
}
String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo); String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo);
if (StringUtils.isNotBlank(identityNoVerification)) { if (StringUtils.isNotBlank(identityNoVerification)) {
return new Result().error(identityNoVerification); return new Result().error(identityNoVerification);

Loading…
Cancel
Save