哨卡完善信息接口修改

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -921,6 +921,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result createPidemicInfo(EpdcAppPidemicCompleteInfoFromDTO completeInfoFromDto) {
 
         String userId = completeInfoFromDto.getUserId();
@@ -931,14 +932,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             return new Result().error("查询用户信息失败");
         }
 
-        String identityNo = completeInfoFromDto.getIdcard();
+        String identityNo = completeInfoFromDto.getIdcard().trim().toUpperCase();
+        String realName = completeInfoFromDto.getName().trim();
+
+        if (userEntity.getPartyFlag().equals(YesOrNoEnum.YES.value())) {
+            if (!(userEntity.getIdentityNo().equals(identityNo) && userEntity.getRealName().equals(realName))) {
+                throw new RenException("党员姓名或身份证号码匹配失败");
+            }
+        }
 
         countOthersByIdentityNo(identityNo, userId, true);
         countOthersByMobile(completeInfoFromDto.getPhone(), userId, true);
 
         UserEntity updateUser = new UserEntity();
         updateUser.setId(userId);
-        updateUser.setRealName(completeInfoFromDto.getName());
+        updateUser.setRealName(realName);
         updateUser.setIdentityNo(identityNo);
         updateUser.setSex(IdentityNoUtils.getSex(identityNo));
         updateUser.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN));