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

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -729,7 +729,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         String orgIdPath = PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids());
 
         LambdaQueryWrapper<IcPartyUnitEntity> q = new LambdaQueryWrapper<>();
-        q.and(q1 -> q1.eq(IcPartyUnitEntity::getAgencyId, agencyId).or(q2 -> q2.eq(IcPartyUnitEntity::getPids, orgIdPath)));
+        q.and(q1 -> q1.eq(IcPartyUnitEntity::getAgencyId, agencyId).or(q2 -> q2.likeRight(IcPartyUnitEntity::getPids, orgIdPath)));
 
         return baseDao.selectCount(q);
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@@ -767,7 +767,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
 
         LambdaQueryWrapper<IcPartyServiceCenterEntity> q = new QueryWrapper<IcPartyServiceCenterEntity>().select(" org_type, count(*) qtyOfType")
                 .lambda()
-                .and(c1 -> c1.eq(IcPartyServiceCenterEntity::getOrgId, orgId).or(c2 -> c2.eq(IcPartyServiceCenterEntity::getPids, orgIdPath)))
+                .and(c1 -> c1.eq(IcPartyServiceCenterEntity::getOrgId, orgId).or(c2 -> c2.likeRight(IcPartyServiceCenterEntity::getPids, orgIdPath)))
                 .groupBy(IcPartyServiceCenterEntity::getOrgType);
 
         List<IcPartyServiceCenterEntity> l = icPartyServiceCenterDao.selectList(q);

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

@@ -66,7 +66,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
             // 街道及以上级别，用pids，因为要从社区开始查，本级及下级
             q = new QueryWrapper<IcPartyOrgEntity>().select(" party_org_type, count(*) childrenQty").lambda()
                     // 本组织下级的所有子级,不含本级
-                    .like(IcPartyOrgEntity::getAgencyPids, orgIdPath)
+                    .likeRight(IcPartyOrgEntity::getAgencyPids, orgIdPath)
                     .groupBy(IcPartyOrgEntity::getPartyOrgType);
         }
 
@@ -168,7 +168,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
     }
 
     /**
-     * @Description: 查询支部。支部是直属的
+     * @Description: 查询支部。支部是直属的!!!!!!!!!!!!!!!!!!!!!!!!!!!
      * @param orgId:
      * @param orgType:
      * @Return java.util.List<com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectByTypeRstDTO>

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

@@ -314,9 +314,9 @@
         from ic_party_org o
                  left join ic_party_member m on (o.ID = m.SSZB and m.DEL_FLAG = 0)
         where o.DEL_FLAG = 0
-          and o.AGENCY_ID = #{orgId}
+          and o.AGENCY_PIDS like #{orgId}
           and o.PARTY_ORG_TYPE = 5
         group by o.ID, o.PARTY_ORG_NAME, o.LATITUDE, o.LONGITUDE
     </select>
 
-</mapper>
+</mapper>