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

# Conflicts:
#	esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

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

@@ -79,8 +79,11 @@ public class ApiActUserRelationController {
 
 
         String identityNo = epdcUserInfoResultDTO.getIdentityNo();
-        if ("".equals(identityNo)) {
+        if (StringUtils.isEmpty(identityNo)) {
             // 身份证号码为空，需要重新认证志愿者
+            isVolunteer.setData(0);
+            isVolunteer.error("身份证号码无效，请重新认证志愿者！");
+
             return isVolunteer;
         }
         String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo);