看板目录展示逻辑修改

bi-server/src/main/java/com/usoftchina/bi/server/controller/dashboard/DashboardMenuController.java

@@ -27,7 +27,7 @@ public class DashboardMenuController {
     @CheckToken
     @ApiOperation(value = "目录列表", notes = "目录列表", response = RepEntity.class)
     public RepEntity list(@RequestHeader String token){
-        return new RepEntity(RepCode.success, dashBoardMenuService.list());
+        return new RepEntity(RepCode.success, dashBoardMenuService.list(token));
     }
 
     @PostMapping("/save")

bi-server/src/main/java/com/usoftchina/bi/server/dao/dashboard/DashBoardMenuMapper.java

@@ -15,8 +15,8 @@ public interface DashBoardMenuMapper {
 
     @Select("SELECT BDM_ID id,BDM_NAME name,'menu' type,BDM_PARENTID parentId FROM BI_DASHBOARDS_MENU WHERE BDM_PARENTID = #{id, jdbcType=INTEGER} "
             + "UNION ALL "
-            + "SELECT ID id,BD_NAME name,'dashboard' type,BD_MENUID parentId FROM BI_DASHBOARDS WHERE BD_MENUID = #{id, jdbcType=INTEGER}")
-    List<DashboardMenuRespDTO> getMenuById(int id);
+            + "SELECT ID id,BD_NAME name,'dashboard' type,BD_MENUID parentId FROM BI_DASHBOARDS WHERE BD_MENUID = #{id, jdbcType=INTEGER} AND CREATE_ID = #{userId,jdbcType=INTEGER}")
+    List<DashboardMenuRespDTO> getMenuById(@Param("userId") int userId, @Param("id") int id);
 
     /**
      * 保存

bi-server/src/main/java/com/usoftchina/bi/server/service/dashboard/DashBoardMenuService.java

@@ -24,16 +24,17 @@ public class DashBoardMenuService {
     @Autowired
     private DashBoardMenuMapper dashBoardMenuMapper;
 
-    public List<DashboardMenuRespDTO> list(){
-        return getData(0);
+    public List<DashboardMenuRespDTO> list(String token){
+        int userId = Integer.parseInt(GetTokenDataUtil.getTokenData(token).get("id"));
+        return getData(userId, 0);
     }
 
-    private List<DashboardMenuRespDTO> getData(int id){
-        List<DashboardMenuRespDTO> dashboardMenuRespDTOList = dashBoardMenuMapper.getMenuById(id);
+    private List<DashboardMenuRespDTO> getData(int userId, int id){
+        List<DashboardMenuRespDTO> dashboardMenuRespDTOList = dashBoardMenuMapper.getMenuById(userId, id);
         if (!CollectionUtils.isEmpty(dashboardMenuRespDTOList)) {
             for (DashboardMenuRespDTO dashboardMenuRespDTO : dashboardMenuRespDTOList) {
                 if ("menu".equals(dashboardMenuRespDTO.getType())) {
-                    dashboardMenuRespDTO.setChildren(getData(dashboardMenuRespDTO.getId()));
+                    dashboardMenuRespDTO.setChildren(getData(userId, dashboardMenuRespDTO.getId()));
                 }
             }
         }