From f7b587539513cae6381c256dcc7daa4f131fb8ef Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 1 Nov 2022 15:41:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/service/impl/IcPartyMemberServiceImpl.java     | 3 +--
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java     | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
index 9685adfdd6..11066c8b70 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
@@ -13,7 +13,6 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
-import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.enums.PartyPostEnum;
@@ -691,7 +690,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         if (result.success() && null != result.getData()) {
             e.setIcResiUser(result.getData().getIcResiUser());
             e.setVolunteerCategory(result.getData().getVolunteerCategory());
-            e.setAddress(result.getData().getAddress());
+            e.setAddress(StringUtils.isNotBlank(result.getData().getAddress())?result.getData().getAddress():e.getAddress());
         }
         e.setCreatedBy(currentUserId);
         e.setUpdatedBy(currentUserId);
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 5e6d96668a..06ff565ac7 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
@@ -2981,6 +2981,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             memberMap.put("LDZH", dto.getLdzh());
             memberMap.put("PARTY_ZW", dto.getPartyZw());
             memberMap.put("IS_DYZXH", dto.getIsDyzxh());
+            memberMap.put("RDSSZZB", dto.getRdsszzb());
+            memberMap.put("ZZGXZRSQSJ", dto.getZzgxzrsqsj());
+            memberMap.put("IS_QCJ", dto.getIsQcj());
             list.add(memberMap);
             detail.put("ic_party_member", list);
         }

From 35dda6b988b2697076a4b90a57df5208ff13d6d4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 1 Nov 2022 16:07:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V0.0.12__edit_partymember.sql | 4 ++++
 .../main/resources/db/migration/V0.0.80__edit_partymember.sql | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql
new file mode 100644
index 0000000000..b6e7cccd0c
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.12__edit_partymember.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `ic_party_member`
+    ADD COLUMN `RDSSZZB`    varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`,
+    ADD COLUMN `ZZGXZRSQSJ` varchar(64)  NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`,
+    ADD COLUMN `IS_QCJ`     char(2)      NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`;
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql
new file mode 100644
index 0000000000..b6e7cccd0c
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.80__edit_partymember.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `ic_party_member`
+    ADD COLUMN `RDSSZZB`    varchar(255) NULL COMMENT '入党时所在党支部' AFTER `IS_DYZXH`,
+    ADD COLUMN `ZZGXZRSQSJ` varchar(64)  NULL COMMENT '组织关系转入社区时间' AFTER `RDSSZZB`,
+    ADD COLUMN `IS_QCJ`     char(2)      NULL COMMENT '是否请长假' AFTER `ZZGXZRSQSJ`;
\ No newline at end of file