getOverallBoundLevel逻辑完善

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<BuildingPageVO> getListPage(BuildingSearchParams pageSearchParam);
 
+    List<Long> getBuildingIdListByCompanyId(@Param("companyId") Long companyId);
 }

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml

@@ -34,6 +34,15 @@
         </if>
         order by bbuilding.building_id desc
     </select>
+
+    <select id="getBuildingIdListByCompanyId" resultType="java.lang.Long">
+        SELECT
+            building_id
+        FROM
+            basic_building
+        WHERE company_id = #{companyId} AND flag = 0
+        ORDER BY building_id
+    </select>
     
     
 </mapper>

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<Long> getBindBuildingIdList(Long userId) {
+	public List<Long> 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<Long> bindedBuildingList = levelMapperExt.getBoundBuilding(userId);
 			if (CollectionUtils.isEmpty(bindedBuildingList)) {

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<List<OverviewVO>> getOverviewInfo(Long userId, Long companyId, Integer languageType, Integer utcOffset) {
 		Map<String, Object> buildingMap = new HashMap<>();
 		buildingMap.put("companyId", companyId);
-		buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId));
+		buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId, companyId));
 
 		List<OverviewVO> buildingInfoList = overviewInfoMapperExt.getBuildingInfo(buildingMap);
 
@@ -276,7 +276,7 @@ public class OverviewServiceImpl implements OverviewService {
 	public SimpleDataResponse<List<TreeMenusDTO>> getOverallBoundLevel(Long companyId, Long userId, Integer languageType) {
 		Map<String, Object> buildingMap = new HashMap<>();
 		buildingMap.put("companyId", companyId);
-		buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId));
+		buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId, companyId));
 		List<BuildingPathDTO> selectBuildingFullPath = levelMapperExt.selectBuildingFullPath(buildingMap);
 
 		// 构建节点