Merge remote-tracking branch 'origin/dev_partymember_sync' into dev_partymember_sync

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);

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`;

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);
         }

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`;