From 85544c6823778b42e03639c3b52f6e88354013c4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 2 Nov 2022 14:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/entity/IcPartyMemberEntity.java     | 15 +++++++++++++++
 .../epmet/service/impl/IcResiUserServiceImpl.java |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java
index 10add799d0..07ca2844b1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java
@@ -85,6 +85,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity {
      */
 	private String isDyzxh;
 
+	/**
+	 * 入党时所在党支部
+	 */
+	private String rdsszzb;
+
+	/**
+	 * 组织关系转入社区时间
+	 */
+	private String zzgxzrsqsj;
+
+	/**
+	 * 是否请长假
+	 */
+	private String isQcj;
+
     /**
      * 预留字段1
      */
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 da40690ee6..53207c7750 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
@@ -342,6 +342,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     partyMemberDTO.setName(map.get("NAME"));
                     partyMemberDTO.setIdCard(map.get("ID_CARD"));
                     partyMemberDTO.setMobile(map.get("MOBILE"));
+                    partyMemberDTO.setCulture(map.get("CULTURE"));
 
                     String houseAddress = getHouseAddress4PartymemberInfo(tokenDto.getCustomerId(), map.get("GRID_ID"), map.get("HOME_ID"));
                     partyMemberDTO.setAddress(houseAddress);
@@ -606,6 +607,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     } else {
                         partyMemberDTO.setMobile(icResiUser.getMobile());
                     }
+                    if (map.containsKey("CULTURE")) {
+                        partyMemberDTO.setCulture(map.get("CULTURE"));
+                    } else {
+                        partyMemberDTO.setCulture(icResiUser.getCulture());
+                    }
+
                     //查询网格信息
                     String gridId = null;
                     if (map.containsKey("GRID_ID")) {
@@ -2438,6 +2445,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             user.setName(formDTO.getName());
             user.setMobile(formDTO.getMobile());
             user.setIsParty(NumConstant.ONE_STR);
+            user.setCulture(formDTO.getCulture());
             //如果是党员中心户，则居民是志愿者
             if (NumConstant.ONE_STR.equals(formDTO.getIsDyzxh())) {
                 user.setIsVolunteer(NumConstant.ONE_STR);