fix

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java

@@ -146,7 +146,7 @@ public interface IcPartyOrgDao extends BaseDao<IcPartyOrgEntity> {
                                                                               @Param("agencyId") String agencyId,
                                                                               @Param("orgIdpath") String orgIdpath);
 
-    List<LingShanScreenPartyObjectByTypeRstDTO> lingshanListDw(@Param("orgIdPath") String orgIdPath);
+    List<LingShanScreenPartyObjectByTypeRstDTO> lingshanListDw(@Param("orgIdPath") String orgIdPath, @Param("orgId") String orgId);
 
     /**
      * @Description: 灵山：直属支部

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java

@@ -60,7 +60,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
             q = new QueryWrapper<IcPartyOrgEntity>().select(" party_org_type, count(*) childrenQty").lambda()
                     // 本组织下级的所有子级
                     .eq(IcPartyOrgEntity::getAgencyId, agencyId)
-                    .eq(IcPartyOrgEntity::getPartyOrgType, PartyOrgTypeEnum.BRANCH.getCode()) // 是社区，就只能查询支部了。这里要控制，因为支部的行政组织也是对应到社区，所以这里必须限制一下
+                    // .eq(IcPartyOrgEntity::getPartyOrgType, PartyOrgTypeEnum.BRANCH.getCode()) // 是社区，就只能查询支部了。这里要控制，因为支部的行政组织也是对应到社区，所以这里必须限制一下
                     .groupBy(IcPartyOrgEntity::getPartyOrgType);
         } else {
             // 街道及以上级别，用pids，因为要从社区开始查，本级及下级
@@ -160,7 +160,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
         if (OrgInfoConstant.AGENCY.equals(orgType)) {
             // 是行政组织，就要查询组织的下一级。查询下一级只能用AGENCY_PIDS
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId);
-            return partyOrgDao.lingshanListDw(PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids()));
+            return partyOrgDao.lingshanListDw(PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids()), orgId);
         } else {
             // 是网格,哪里来的党委？
             return new ArrayList<>();

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml

@@ -301,8 +301,8 @@
         from ic_party_org o
             left join ic_party_member m on (o.AGENCY_ID = m.AGENCY_ID and m.DEL_FLAG = 0)
         where o.DEL_FLAG = 0
-            and o.AGENCY_PIDS = #{orgIdPath}
-            and o.PARTY_ORG_TYPE <= 4
+            and (o.AGENCY_PIDS = #{orgIdPath} or o.AGENCY_ID=#{orgId})
+            and o.PARTY_ORG_TYPE = 4
         group by o.ID, o.PARTY_ORG_NAME, o.LATITUDE, o.LONGITUDE
     </select>