'commit'

dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go

@@ -50,71 +50,36 @@ func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int, [
 		listJson, _ :=json.Marshal(list)
 
 		sql1 := "SELECT * FROM t_dataex_datasource WHERE 1 = 1"
-		//var offset1 = (query.Page - 1) * 10
-		//conditionSql1 := fmt.Sprintf("%s", " limit ? offset ? ")
-		//pageSql1 := fmt.Sprintf("%s %s", sql1, conditionSql1)
 		joinList1, _ := DbUtil.Engine.SQL(sql1).Query().List()
 		joinListJson1, _ := json.Marshal(joinList1)
 		mergedList1 := CommonUtil.ListMerge(string(listJson), string(joinListJson1), "datasource_id", "id", "source_systemid", "system_id")
 
 		sql2 := "SELECT * FROM t_dataex_datasource WHERE 1 = 1"
-		//var offset2 = (query.Page - 1) * 10
-		//conditionSql2 := fmt.Sprintf("%s", " limit ? offset ? ")
-		//pageSql2 := fmt.Sprintf("%s %s", sql2, conditionSql2)
 		joinList2, _ := DbUtil.Engine.SQL(sql2).Query().List()
 		joinListJson2, _ := json.Marshal(joinList2)
 		mergedList2 := CommonUtil.ListMerge(mergedList1, string(joinListJson2), "datasource_id", "id", "datasource_name", "datasource_name")
 
 		sql3 := "SELECT * FROM t_app_base WHERE 1 = 1"
-		//var offset3 = (query.Page - 1) * 10
-		//conditionSql3 := fmt.Sprintf("%s", " limit ? offset ? ")
-		//pageSql3 := fmt.Sprintf("%s %s", sql3, conditionSql3)
 		joinList3, _ := DbUtil.Engine.SQL(sql3).Query().List()
 		joinListJson3, _ := json.Marshal(joinList3)
 		mergedList3 := CommonUtil.ListMerge(mergedList2, string(joinListJson3), "source_systemid", "app_code", "source_systemname", "app_name")
 
 		sql4 := "SELECT * FROM t_app_base WHERE 1 = 1"
-		//var offset4 = (query.Page - 1) * 10
-		//conditionSql4 := fmt.Sprintf("%s", " limit ? offset ? ")
-		//pageSql4 := fmt.Sprintf("%s %s", sql4, conditionSql4)
 		joinList4, _ := DbUtil.Engine.SQL(sql4).Query().List()
 		joinListJson4, _ := json.Marshal(joinList4)
 		mergedList4 := CommonUtil.ListMerge(mergedList3, string(joinListJson4), "consume_systemid", "app_code", "consume_systemname", "app_name")
 
+		sql5 := "SELECT * FROM t_dataex_orgtree WHERE id IN (SELECT consume_orgid FROM t_dataex_dataaccess WHERE 1 = 1" + query.Conditions + ")"
+		joinList5, _ := DbUtil.Engine.SQL(sql5).Query().List()
+		joinListJson5, _ := json.Marshal(joinList5)
+		mergedList5 := CommonUtil.ListMerge(mergedList4, string(joinListJson5), "consume_orgid", "id", "consume_orgname", "org_name")
 
-		//通过SQL获取带缓存的数据
-		/*
-		list, count, _ := CacheUtil.Page(sql, 100, query.Page)
-		listJson, _ :=json.Marshal(list)
-
-		sql1 := "SELECT id FROM t_dataex_datasource WHERE 1 = 1"
-		joinList1, _, _ := CacheUtil.Page(sql1, 10000, 0)
-		joinListJson1, _ := json.Marshal(joinList1)
-		mergedList1 := CommonUtil.ListMerge(string(listJson), string(joinListJson1), "datasource_id", "id", "source_systemid", "system_id")
-
-		sql2 := "SELECT id FROM t_dataex_datasource WHERE 1 = 1"
-		joinList2, _, _ := CacheUtil.Page(sql2, 10000, 0)
-		joinListJson2, _ := json.Marshal(joinList2)
-		mergedList2 := CommonUtil.ListMerge(mergedList1, string(joinListJson2), "datasource_id", "id", "datasource_name", "datasource_name")
-
-		sql3 := "SELECT app_id FROM t_app_base WHERE 1 = 1"
-		joinList3, _, _ := CacheUtil.Page(sql3, 10000, 0)
-		joinListJson3, _ := json.Marshal(joinList3)
-		mergedList3 := CommonUtil.ListMerge(mergedList2, string(joinListJson3), "source_systemid", "app_id", "source_systemname", "app_name")
-
-		sql4 := "SELECT app_id FROM t_app_base WHERE 1 = 1"
-		joinList4, _, _ := CacheUtil.Page(sql4, 10000, 0)
-		joinListJson4, _ := json.Marshal(joinList4)
-		mergedList4 := CommonUtil.ListMerge(mergedList3, string(joinListJson4), "consume_systemid", "app_id", "consume_systemname", "app_name")
-
-
-		 */
-		fmt.Println(mergedList4)
+		//fmt.Println(mergedList5)
 
 		var datas []map[string]interface{}
 
-		json.Unmarshal([]byte(mergedList4), &datas)
-		fmt.Println(datas)
+		json.Unmarshal([]byte(mergedList5), &datas)
+		//fmt.Println(datas)
 
 		return true, "数据获取成功", count, datas, nil
 	} else {