超级用户查看图表BUG

bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ChartsConfigMapper.java

@@ -48,8 +48,9 @@ public interface ChartsConfigMapper {
     /*
     查看图表列表
      */
-    @Select("select id as chartId, chart_name as chartName, chart_type as chartType, create_by as createBy, create_date as createDate" +
-            ",bc_filters as filters, CHART_DESCRIBES as describes, bc_charts_group as chartsGroup, bc_charts_option as chartOption, demo from bi_charts")
+    @Select("select '1' as authority,case when bc.BD_DATA_ID not in(select id from bi_data_connectors) then '1' else '0' end dbStatus, bc.id as chartId, bc.chart_name as chartName, bc.chart_type as chartType, bc.create_by as createBy, bc.create_date as createDate"
+            + ",bc.bc_filters as filters, bc.CHART_DESCRIBES as describes, bc.bc_charts_group as chartsGroup, bc.bc_charts_option as chartOption ,bc.bd_data_id as dataId,bd.data_name as dataName, bc.create_id as createId, bc.demo, bds.BASES_NAME as dataConnectionName, bds.id as dataConnectionId "
+            + "from bi_charts bc left join bi_data_connectors bd on bc.bd_data_id=bd.id left join BI_DATABASES bds on bds.id = BD.DB_CONFIG")
     List<ChartConfigList> getListCharts();
 
     /*
@@ -107,9 +108,6 @@ public interface ChartsConfigMapper {
             "    ))")
     List<ChartConfigList> getListByUser(@Param("id") int id, TestPage testPage);
 
-    @Select("")
-    List<ChartConfigList> getListWithoutLimit(@Param("id") int id, TestPage testPage);
-
     /*
     通过Id查找表名
     */

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ChartsConfigService.java

@@ -205,7 +205,13 @@ public class ChartsConfigService {
      */
     public RepEntity getListCharts(String token, TestPage testPage){
         int id = BaseContextHolder.getUserId();
-        List<ChartConfigList> chartsList = chartsConfigMapper.getListByUser(id,testPage.enablePaging());
+        String role = BaseContextHolder.getRole();
+        List<ChartConfigList> chartsList = new ArrayList<>();
+        if (RoleConstant.SUPER_ADMIN.getRole().equals(role)) {
+            chartsList = chartsConfigMapper.getListCharts();
+        }else {
+            chartsList = chartsConfigMapper.getListByUser(id, testPage.enablePaging());
+        }
         PageInfo<ChartConfigList> pageInfo = new PageInfo<>(chartsList);
         return new RepEntity(RepCode.success, pageInfo);
     }