getOverallBoundLevel的bug

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/LevelMapperExt.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface LevelMapperExt {
@@ -37,6 +38,6 @@ public interface LevelMapperExt {
 
     List<Long> getBoundBuilding(Long userId);
 
-    List<BuildingPathDTO> selectBuildingFullPath(@Param("bindBuildingIdList") List<Long> bindBuildingIdList);
+    List<BuildingPathDTO> selectBuildingFullPath(Map<String, Object> buildingMap);
 
 }

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

@@ -184,7 +184,6 @@
         SELECT DISTINCT building_id
         FROM (
 
-                 -- BUILDING
                  SELECT b.building_id
                  FROM dashboard_level_role_user ru
                           JOIN dashboard_level_role_object ro
@@ -197,7 +196,6 @@
 
                  UNION ALL
 
-                 -- SITE → BUILDING
                  SELECT b.building_id
                  FROM dashboard_level_role_user ru
                           JOIN dashboard_level_role_object ro
@@ -213,7 +211,6 @@
 
                  UNION ALL
 
-                 -- AREA → SITE → BUILDING
                  SELECT b.building_id
                  FROM dashboard_level_role_user ru
                           JOIN dashboard_level_role_object ro
@@ -233,7 +230,6 @@
 
                  UNION ALL
 
-                 -- STORE → AREA → SITE → BUILDING
                  SELECT b.building_id
                  FROM dashboard_level_role_user ru
                           JOIN dashboard_level_role_object ro
@@ -257,7 +253,6 @@
 
                  UNION ALL
 
-                 -- BRANCH → STORE → AREA → SITE → BUILDING
                  SELECT b.building_id
                  FROM dashboard_level_role_user ru
                           JOIN dashboard_level_role_object ro
@@ -321,11 +316,11 @@
 
         JOIN dashboard_level_branch br ON rbs.branch_id = br.id AND br.flag = 0
 
-        WHERE b.building_id IN
+        WHERE b.flag = 0
-        <foreach collection="bindBuildingIdList" item="id" open="(" separator="," close=")">
+        AND b.company_id = #{companyId}
-            #{id}
+        <if test="bindBuildingIdList != null">
-        </foreach>
+            AND b.building_id IN <foreach collection="bindBuildingIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
-        AND b.flag = 0;
+        </if>
     </select>
 
 </mapper>

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java

@@ -274,8 +274,10 @@ public class OverviewServiceImpl implements OverviewService {
 
 	@Override
 	public SimpleDataResponse<List<TreeMenusDTO>> getOverallBoundLevel(Long companyId, Long userId, Integer languageType) {
-		List<Long> bindBuildingIdList = commonOpt.getBindBuildingIdList(userId);
+		Map<String, Object> buildingMap = new HashMap<>();
-		List<BuildingPathDTO> selectBuildingFullPath = levelMapperExt.selectBuildingFullPath(bindBuildingIdList);
+		buildingMap.put("companyId", companyId);
+		buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId));
+		List<BuildingPathDTO> selectBuildingFullPath = levelMapperExt.selectBuildingFullPath(buildingMap);
 
 		// 构建节点
 		Map<String, TreeMenusDTO> nodeMap = new HashMap<>();