From 49d0690a7d8fe283eb9456f771c2ef26120e94be Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Tue, 2 Jul 2019 16:29:02 +0800
Subject: [PATCH] Added the ability for administrators to view all data sources
 by type

---
 .../main/java/cn/escheduler/api/service/DataSourceService.java  | 2 +-
 .../main/java/cn/escheduler/dao/mapper/DataSourceMapper.java    | 2 +-
 .../java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
index 80491f8f32..cb44c5751a 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
@@ -328,7 +328,7 @@ public class DataSourceService extends BaseService{
         List<DataSource> datasourceList;
 
         if (isAdmin(loginUser)) {
-            datasourceList = dataSourceMapper.listAllDataSourceByType();
+            datasourceList = dataSourceMapper.listAllDataSourceByType(type);
         }else{
             datasourceList = dataSourceMapper.queryDataSourceByType(loginUser.getId(), type);
         }
diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java
index acedde653d..66a7b61bbc 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java
@@ -227,6 +227,6 @@ public interface DataSourceMapper {
             @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE)
     })
     @SelectProvider(type = DataSourceMapperProvider.class, method = "listAllDataSourceByType")
-    List<DataSource> listAllDataSourceByType();
+    List<DataSource> listAllDataSourceByType(@Param("type") Integer type);
 
 }
diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java
index 61461ff1c1..7613e555c1 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java
@@ -239,6 +239,7 @@ public class DataSourceMapperProvider {
     return new SQL() {{
       SELECT("*");
       FROM(TABLE_NAME);
+      WHERE("type = #{type}");
     }}.toString();
   }