'commit'

dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go

@@ -16,7 +16,6 @@ var db = DbUtil.Engine
 
 func GetDatasourceRow(query string) (bool, string, map[string]interface{}, error) {
 	sql := "SELECT * FROM t_dataex_datasource WHERE 1 = 1 " + query
-	fmt.Println("sql::", sql)
 
 	var datasource models.TDataexDatasource
 	has, _ := DbUtil.Engine.SQL(sql).Get(&datasource)
@@ -47,7 +46,7 @@ func GetDatasourceResults(query MySwagger.DatasourceQuery) (bool, string, int, [
 	if list != nil {
 		listJson, _ :=json.Marshal(list)
 
-		sql1 := "SELECT * FROM t_dataex_orgtree"
+		sql1 := "SELECT * FROM t_dataex_orgtree WHERE id IN (SELECT provide_orgid FROM t_dataex_datasource WHERE 1 = 1" + query.Conditions + ")"
 		//var offset1 = (query.Page - 1) * 10
 		//conditionSql1 := fmt.Sprintf("%s", " limit ? offset ? ")
 		//pageSql1 := fmt.Sprintf("%s %s", sql1, conditionSql1)