Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

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

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