看板目录返回报表数据错误修复

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

@@ -66,6 +66,6 @@ public class DashboardMenuController {
     @CheckToken
     @ApiOperation(value = "获得目录下的所有报表", notes = "通过MenuId获得目录下的所有报表", response = RepEntity.class)
     public RepEntity getDashBoardByMenuId(@RequestHeader String token, @PathVariable("menuId") int menuId){
-        return dashBoardMenuService.getDashBoardByMenuId(menuId);
+        return dashBoardMenuService.getDashBoardByMenuId(token, menuId);
     }
 }

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

@@ -64,10 +64,14 @@ public interface DashBoardMenuMapper {
 
     /**
      * 获取目录下的所有看板
-     * @param id
+     * @param userId
+     * @param menuId
      * @return
      */
-    @Select("SELECT id, bd_note as bdNote, bd_name as bdName, CONFIGURATION as bdConfiguration, CREATE_BY as createBy, create_id as createId, CREATE_DATE as createDate, BD_THUMBNAIL as thumbnail, relation_columns as relationColumns, filters, demo, bd_code as bdCode,BD_MENUID as menuId  FROM BI_DASHBOARDS WHERE BD_MENUID = #{id,jdbcType=INTEGER}")
-    List<Dashboards> getDashBoardByMenuId(int id);
+    @Select("SELECT id, bd_note as bdNote, bd_name as bdName, CONFIGURATION as bdConfiguration, CREATE_BY as createBy, "
+            + "create_id as createId, CREATE_DATE as createDate, BD_THUMBNAIL as thumbnail, relation_columns as relationColumns, "
+            + "filters, demo, bd_code as bdCode,BD_MENUID as menuId  FROM BI_DASHBOARDS WHERE BD_MENUID = #{menuId,jdbcType=INTEGER} "
+            + "AND CREATE_ID = #{userId,jdbcType=INTEGER}")
+    List<Dashboards> getDashBoardByMenuId(@Param("userId") int userId, @Param("menuId") int menuId);
 
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.bi.server.service.dashboard;
 
 import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
+import com.usoftchina.bi.core.utils.GetTokenDataUtil;
 import com.usoftchina.bi.server.dao.dashboard.DashBoardMenuMapper;
 import com.usoftchina.bi.server.model.vo.configVo.DashBoardMenuInfo;
 import com.usoftchina.bi.server.model.vo.configVo.DashBoardUpdateMenuInfo;
@@ -56,8 +57,9 @@ public class DashBoardMenuService {
         dashBoardMenuMapper.updateDashBoardMenu(dashBoardUpdateMenuInfo);
     }
 
-    public RepEntity getDashBoardByMenuId(int menuId){
-        return new RepEntity(RepCode.success, dashBoardMenuMapper.getDashBoardByMenuId(menuId));
+    public RepEntity getDashBoardByMenuId(String token, int menuId){
+        int userId = Integer.parseInt(GetTokenDataUtil.getTokenData(token).get("id"));
+        return new RepEntity(RepCode.success, dashBoardMenuMapper.getDashBoardByMenuId(userId, menuId));
     }
 
 }