完善大屏

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

@@ -1409,7 +1409,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
         List<HouseScreenStatisticsResultDTO> result = new ArrayList<>();
         // 当前可能有两种情况 一种是社区下房屋数量 一种是网格下房屋数量
-        if (level.equals("street")){
+        if (level.equals("street")||level.equals("city")){
             LambdaQueryWrapper<CustomerAgencyEntity> childAgencyListLq =
                     new LambdaQueryWrapper<CustomerAgencyEntity>().eq(CustomerAgencyEntity::getPid,agencyId);
             List<CustomerAgencyEntity> communityList = customerAgencyDao.selectList(childAgencyListLq);
@@ -1460,7 +1460,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         PageInfo<HouseScreenListResultDTO> pageInfo = new PageInfo<>();
 
         // 当前可能有两种情况 一种是社区下房屋数量 一种是网格下房屋数量
-        if (dto.getLevel().equals("community")) {
+        if (dto.getLevel().equals("community")||dto.getLevel().equals("street")) {
             LambdaQueryWrapper<CustomerAgencyEntity> childAgencyListLq =
                     new LambdaQueryWrapper<CustomerAgencyEntity>().eq(CustomerAgencyEntity::getPid, dto.getAgencyId());
             CustomerAgencyEntity community = customerAgencyDao.selectById(dto.getAgencyId());