diff --git a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicBuildingMapperExt.java b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicBuildingMapperExt.java index c35cd20..423b0dc 100644 --- a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicBuildingMapperExt.java +++ b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicBuildingMapperExt.java @@ -4,6 +4,7 @@ import com.dongjian.dashboard.back.dao.auto.BasicBuildingMapper; import com.dongjian.dashboard.back.dto.building.BuildingSearchParams; import com.dongjian.dashboard.back.vo.building.BuildingPageVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,4 +13,5 @@ public interface BasicBuildingMapperExt extends BasicBuildingMapper { List getListPage(BuildingSearchParams pageSearchParam); + List getBuildingIdListByCompanyId(@Param("companyId") Long companyId); } diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml index e69017f..8e0ce87 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml @@ -34,6 +34,15 @@ order by bbuilding.building_id desc + + \ No newline at end of file diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java index ac698a6..7d0f054 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java @@ -76,6 +76,8 @@ public class CommonOpt { private DeviceRawdataRealtimeMapperExt deviceRawdataRealtimeMapperExt; @Autowired private DeviceInfoMapperExt deviceInfoMapperExt; + @Autowired + private BasicBuildingMapperExt basicBuildingMapperExt; @Autowired private MsgLanguageChange msgLanguageChange; @@ -254,10 +256,10 @@ public class CommonOpt { // } // } // } - public List getBindBuildingIdList(Long userId) { + public List getBindBuildingIdList(Long userId, Long companyId) { Integer levelManager = basicUserMapperExt.checkLevelManager(userId); if (levelManager > 0) { - return null;//null表示不限制, sql里面判定bindedBuildingList=null的话,就不限制楼宇 + return basicBuildingMapperExt.getBuildingIdListByCompanyId(companyId); } else { List bindedBuildingList = levelMapperExt.getBoundBuilding(userId); if (CollectionUtils.isEmpty(bindedBuildingList)) { diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java index 3fb567b..9ca3d50 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java @@ -68,7 +68,7 @@ public class OverviewServiceImpl implements OverviewService { public SimpleDataResponse> getOverviewInfo(Long userId, Long companyId, Integer languageType, Integer utcOffset) { Map buildingMap = new HashMap<>(); buildingMap.put("companyId", companyId); - buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId)); + buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId, companyId)); List buildingInfoList = overviewInfoMapperExt.getBuildingInfo(buildingMap); @@ -276,7 +276,7 @@ public class OverviewServiceImpl implements OverviewService { public SimpleDataResponse> getOverallBoundLevel(Long companyId, Long userId, Integer languageType) { Map buildingMap = new HashMap<>(); buildingMap.put("companyId", companyId); - buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId)); + buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId, companyId)); List selectBuildingFullPath = levelMapperExt.selectBuildingFullPath(buildingMap); // 构建节点