From e02730cfb191fb1e4722297eb47c0da7c4a5f30d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 25 May 2022 16:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/commons/tools/enums/PartyPostEnum.java | 2 +-
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyPostEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyPostEnum.java
index 80c9d81155..3985bc8f3b 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyPostEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyPostEnum.java
@@ -30,7 +30,7 @@ public enum PartyPostEnum {
                 return partyPostEnum.getName();
             }
         }
-        return PartyPostEnum.UN_KNOWN.getName();
+        return null;
     }
 
     public static String getCode(String name) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index cd78e9148d..38cee7cf0c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2068,6 +2068,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
             }
             dto.setIcResiUser(user.getId());
+            formDTO.setIcResiUser(user.getId());
             //更新居民信息并将是否是党员字段设为1
             user.setName(formDTO.getName());
             user.setMobile(formDTO.getMobile());
@@ -2101,7 +2102,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 return dto;
             }
             dto.setIcResiUser(user.getId());
-
+            formDTO.setIcResiUser(user.getId());
             //更新居民信息并将是否是党员字段设为1
             user.setName(formDTO.getName());
             user.setMobile(formDTO.getMobile());