From 254f93a921a6b5b5f12eb6de1c099e2e4b669775 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 11 May 2022 19:15:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=94=9F=E8=B0=83=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcBirthRecordServiceImpl.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
index c3225149ad..afb5f9bfd4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
@@ -157,9 +157,9 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
                             if (StringUtils.isBlank(dto.getIsReplace())) {
                                 throw new EpmetException("居民信息中房屋信息与当前选择房屋不一致，是否更新？");
                             } else if (NumConstant.ONE_STR.equals(dto.getIsReplace())) {
+                                extracted(tokenDto, dto, staffInfo, sync, "change");
                                 //更新居民信息
                                 icResiUserDao.updateById(userEntity);
-                                extracted(tokenDto, dto, staffInfo, sync, "change");
                             }
                         } else {
                             //房屋信息一致
@@ -168,18 +168,17 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
                         }
                     } else {
                         //迁出或注销状态，
-                        //更新居民信息
-                        icResiUserDao.updateById(userEntity);
                         //迁入记录
                         extracted(tokenDto, dto, staffInfo, sync, "in");
+                        //更新居民信息
+                        icResiUserDao.updateById(userEntity);
                     }
                 } else {
                     //组织不相等的情况
-                    //更新居民信息
-                    icResiUserDao.updateById(userEntity);
                     //迁入记录
                     extracted(tokenDto, dto, staffInfo, sync, "in");
-
+                    //更新居民信息
+                    icResiUserDao.updateById(userEntity);
                 }
             } else {
                 //添加居民信息