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

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/exception/ErrorCode.java

@@ -40,4 +40,5 @@ public interface ErrorCode {
     int JSON_FORMAT_ERROR = 10016;
     int PARSING_ERROR = 10017;
     int INVALID_ERROR = 10018;
+    int VOLUNTEER_ERROR = 10021;
 }

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

@@ -9,6 +9,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -76,11 +77,14 @@ public class ApiActUserRelationController {
         } else {
             actUserRelationDTO.setPartyFlag(YesOrNoEnum.NO.value());
         }
-        
+
         String identityNo = epdcUserInfoResultDTO.getIdentityNo();
         String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo);
         if (StringUtils.isNotBlank(identityNoVerification)) {
-            return new Result().error(identityNoVerification);
+            Result result = new Result();
+            result.error(identityNoVerification);
+            result.setCode(ErrorCode.VOLUNTEER_ERROR);
+            return result;
         }
         actUserRelationDTO.setRealName(tokenDto.getRealName());
         String sex = IdentityNoUtils.getSex(identityNo); // 身份证解析性别