From 7698e0592b6b4abd8253c6f8ac08136535db4238 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 16 May 2023 17:42:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ic=5Fhouse=E6=88=BF=E5=B1=8B=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9APARTY=5FCENTER=5FHOUSE=5FFLAG?= =?UTF-8?q?=EF=BC=9A=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE=EF=BC=9A=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=9A=E5=91=98=E4=B8=AD=E5=BF=83=E6=88=B7=EF=BC=9A?= =?UTF-8?q?1=E6=98=AF=EF=BC=9B0=E4=B8=8D=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcHouseDTO.java | 4 ++++ .../src/main/java/com/epmet/entity/IcHouseEntity.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java index 93735939e8..31111bbe87 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java @@ -173,4 +173,8 @@ public class IcHouseDTO implements Serializable { private String longitude; private String latitude; + /** + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index fe282a9265..4ee85491ae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -139,4 +139,8 @@ public class IcHouseEntity extends BaseEpmetEntity { private String longitude; private String latitude; + /** + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; } From defddf443f807319b550caaca7e9bc2f93269c03 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 16 May 2023 17:56:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E3=80=91=E5=85=9A=E7=BB=84=E7=BB=87=E6=A0=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=85=9A=E5=91=98=E6=9F=A5=E4=B8=8D=E5=88=B0=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LingShanScreenServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 74332828cd..274ebff387 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -159,15 +159,19 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD if (partyOrg == null) { String baseErrorMsg = "【灵山大屏】党组织下的党员列表-未找到党组织信息。"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format(baseErrorMsg + "partyOrgId:" + partyOrg), baseErrorMsg); - } else if (Integer.valueOf(partyOrg.getPartyOrgType()) >= 4) { + } else if (Integer.valueOf(partyOrg.getPartyOrgType()) <= 4) { // 0省委,1市委,2区委,3党工委,4党委,5支部。党委以上，除了支部 query = new LambdaQueryWrapper<>(); - query.eq(IcPartyMemberEntity::getOrgPids, PidUtils.convertPid2OrgIdPath(partyOrgId, partyOrg.getOrgPids())); + // query.eq(IcPartyMemberEntity::getOrgPids, PidUtils.convertPid2OrgIdPath(partyOrgId, partyOrg.getOrgPids())); + + String orgIdPath = PidUtils.convertPid2OrgIdPath(partyOrgId, partyOrg.getOrgPids()); + query.eq(IcPartyMemberEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + query.and(c1 -> c1.eq(IcPartyMemberEntity::getAgencyId, partyOrg.getAgencyId()).or(c2 -> c2.likeRight(IcPartyMemberEntity::getAgencyPids, orgIdPath))); } else { // 5支部 query = new LambdaQueryWrapper<>(); - query.eq(IcPartyMemberEntity::getOrgPids, partyOrg.getOrgPids()); + query.eq(IcPartyMemberEntity::getSszb, partyOrg.getId()); // 直接用所属支部 query.eq(IcPartyMemberEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); }