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

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1334,35 +1334,35 @@ public class AppUserServiceImpl implements AppUserService {
         boolean partyFlag = UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER);
         // 此次完善信息后是否变为党员
         boolean newPartyFlag = Boolean.FALSE;
-
         UserDTO user = getUserInfoById(tokenDto.getUserId());
-        if (!volunteerFlag) {
-            // 处理和验证身份证号码
-            String identityNo = fixAndCheckIdentityNo(formDto.getIdentityNo());
-            String realName = ModuleUtils.replaceIllegalCharacter(formDto.getRealName());
-            if (partyFlag) {
-                // 如果是党员，不再进行完善个人信息处理
-                if (!user.getIdentityNo().equals(identityNo) || !user.getRealName().equals(realName)) {
-                    return new Result().error("姓名或身份证号码有误，请核实信息");
-                }
-            } else {
-                // 非党员，调用用户完善个人信息接口
-                EpdcCompleteUserInfoFormV2DTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormV2DTO.class);
-                // set 党员标识，将志愿者完善信息视为党员完善信息，方便身份证号码唯一校验等操作
-                epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
-                epdcCompleteUserInfoFormDTO.setUserAuthType(UserAuthTypeEnum.VOLUNTEER_AUTH.value());
-                Result<UserDTO> result = completeUserInfoCore(tokenDto, epdcCompleteUserInfoFormDTO);
-
-                UserDTO completeUser = result.getData();
-                user.setGrid(completeUser.getGrid());
-                user.setState(completeUser.getState());
-                if (YesOrNoEnum.YES.value().equals(completeUser.getPartyFlag())) {
-                    newPartyFlag = Boolean.TRUE;
-                }
+
+        // 处理和验证身份证号码
+        String identityNo = fixAndCheckIdentityNo(formDto.getIdentityNo());
+        String realName = ModuleUtils.replaceIllegalCharacter(formDto.getRealName());
+        if (partyFlag) {
+            // 如果是党员，不再进行完善个人信息处理
+            if (!user.getIdentityNo().equals(identityNo) || !user.getRealName().equals(realName)) {
+                return new Result().error("姓名或身份证号码有误，请核实信息");
+            }
+        } else {
+            // 非党员，调用用户完善个人信息接口
+            EpdcCompleteUserInfoFormV2DTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormV2DTO.class);
+            // set 党员标识，将志愿者完善信息视为党员完善信息，方便身份证号码唯一校验等操作
+            epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());
+            epdcCompleteUserInfoFormDTO.setUserAuthType(UserAuthTypeEnum.VOLUNTEER_AUTH.value());
+            Result<UserDTO> result = completeUserInfoCore(tokenDto, epdcCompleteUserInfoFormDTO);
+
+            UserDTO completeUser = result.getData();
+            user.setGrid(completeUser.getGrid());
+            user.setState(completeUser.getState());
+            if (YesOrNoEnum.YES.value().equals(completeUser.getPartyFlag())) {
+                newPartyFlag = Boolean.TRUE;
             }
-            formDto.setSex(IdentityNoUtils.getSex(identityNo));
-            formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN));
-            formDto.setUserId(tokenDto.getUserId());
+        }
+        formDto.setSex(IdentityNoUtils.getSex(identityNo));
+        formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN));
+        formDto.setUserId(tokenDto.getUserId());
+        if (!volunteerFlag) {
             // 新增志愿者
             Result<Integer> insertCountResult = userFeignClient.insertVolunteerInfo(formDto);
             if (!insertCountResult.success()) {