From bf1f2b6258e16a450a80e83c5e4913dd2284fa33 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 1 Nov 2022 17:53:35 +0800 Subject: [PATCH 1/4] =?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 --- .../commons/tools/processor/MaskProcessor.java | 5 +++-- .../service/impl/IcPartyMemberServiceImpl.java | 4 ++++ .../epmet/service/impl/IcResiUserServiceImpl.java | 14 +++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java index a3169a2ec6..6692b792d5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java @@ -15,7 +15,6 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /** * desc:脱敏处理器 @@ -209,7 +208,9 @@ public class MaskProcessor { } String maskStr = StrUtil.repeatByLength("*", length - 7); - + if (length != 11) { + return StringUtils.leftPad(StringUtils.right(originString, 4), length, "*"); + } return originString.replaceAll("^(1\\d{2})\\d*(\\d{4})$", new StringBuilder("$1").append(maskStr).append("$2").toString()); } 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 11066c8b70..d9d43ea387 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 @@ -398,6 +398,9 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl partyWrapper = new LambdaQueryWrapper<>(); partyWrapper.eq(IcPartyMemberEntity::getIcResiUser, formDTO.getIcResiUser()); IcPartyMemberEntity partyMember = icPartyMemberDao.selectOne(partyWrapper); From 81cfbc25336ba9eca83247c3ae538bf3ef3df932 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Nov 2022 09:53:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E6=B8=85=E9=99=A4=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 37f4cc13be..da40690ee6 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 @@ -2475,7 +2475,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 2 Nov 2022 14:47:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=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 Date: Wed, 2 Nov 2022 16:10:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 53207c7750..73888d2edb 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 @@ -2401,6 +2401,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl