diff --git a/dsDataex/Config/Config.ini b/dsDataex/Config/Config.ini
index 66999bff..8c4ee0c7 100644
--- a/dsDataex/Config/Config.ini
+++ b/dsDataex/Config/Config.ini
@@ -5,9 +5,9 @@ database = db_dataex
 user = root
 pwd = dsideal
 
-;ip = 10.10.6.200
+;ip = 10.10.14.187
 ;port = 22066
-;database = base_db_zhangjun
+;database = base_db_dev
 ;user = root
 ;pwd = DsideaL147258369
 
@@ -33,6 +33,7 @@ process_no = 1
 
 [elasticsearch]
 nodes = http://10.10.14.61:9200,http://10.10.14.62:9200,http://10.10.14.63:9200
+;http://10.10.14.188:9200,
 ;nodes = http://192.168.0.200:9200,http://192.168.0.200:9201,http://192.168.0.200:9202
 user = root
 pwd = dsideal
diff --git a/dsDataex/MyService/DataEX/DataexDAO/DataexDAO.go b/dsDataex/MyService/DataEX/DataexDAO/DataexDAO.go
index a6d69da0..440566d5 100644
--- a/dsDataex/MyService/DataEX/DataexDAO/DataexDAO.go
+++ b/dsDataex/MyService/DataEX/DataexDAO/DataexDAO.go
@@ -153,6 +153,10 @@ func GetDatasourceOrgIDS(consumeType int,orgID string) []string {
 		break
 	case 2:
 		result=CacheUtil.OrgtreeGetScope(orgID)
+		//add by zhangjun 2020-08-05
+		if len(result)==0{
+			result=append(result,orgID)
+		}
 
 		break
 	case -1:
diff --git a/dsDataex/Utils/CacheUtil/OrgtreeCache.go b/dsDataex/Utils/CacheUtil/OrgtreeCache.go
index 3014c1bf..a22ac131 100644
--- a/dsDataex/Utils/CacheUtil/OrgtreeCache.go
+++ b/dsDataex/Utils/CacheUtil/OrgtreeCache.go
@@ -33,6 +33,7 @@ func OrgtreeCacheInit(){
 
 	PARENT_IDS=make([]string,0)
 
+
 	if count>0{
 		for no:=0;no<int(count);no++{
 			//TODO:目前只支持教育局下属学校的数据访问控制，暂不支持其他机构类型（如：大学区、主校分校...）
@@ -200,6 +201,9 @@ func OrgCacheCreate(orgID string,scope... string) {
 func Orgtree2Redis(list []map[string]interface{}, cacheName string) {
 
 	var ids string
+	//add by zhangjun 2020-08-05
+	old,_ :=RedisUtil.RedisClient.Get(cacheName).Result()
+	ids=old
 
 	for i := 0; i < len(list); i++ {
 		bean := list[i]
diff --git a/dsDataex/gin_server.log b/dsDataex/gin_server.log
index ec28ac85..7834a14b 100644
--- a/dsDataex/gin_server.log
+++ b/dsDataex/gin_server.log
@@ -1468,3 +1468,25 @@
 {"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:01:12","data_id":"DA32166E-5FCD-4183-AC23-0C243EA44DC5","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0163603,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:01:12","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:01:12+08:00","user_id":"-1"}
 {"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:01:15","data_id":"00B02219-847E-47AF-944E-68C08BDC3162","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:01:15","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:01:15+08:00","user_id":"-1"}
 {"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:01:15","data_id":"D921B530-7208-4E8E-A7BE-2060F493E797","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0150683,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:01:15","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:01:15+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:26","data_id":"0B1B0B45-679E-4FDA-84E8-111512CCD4EE","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:26","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:26+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:26","data_id":"8A6F6C44-75FC-4AA4-A709-F5EBD7D380CD","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0259962,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:26","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:26+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:28","data_id":"6AD57C87-2D7A-48AF-B9BE-58D8C43EB14C","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:28","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:28+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:28","data_id":"EB631F4F-1FFC-4EF4-9A92-D86CC29A11EA","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0507972,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:28","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:28+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:30","data_id":"64FA4BF9-3A98-49EC-9647-6EC354549696","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:30","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:30+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:30","data_id":"9C9A31A4-20E8-4A85-A7E2-0C349378BF82","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0221064,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:30","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:30+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:31","data_id":"980C51EF-BE0D-48EB-B5B7-7743BFAC3E11","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:31","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:31+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:31","data_id":"5F1DC47A-0000-49EB-8378-25D53E528D10","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0204111,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:31","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:31+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:33","data_id":"62380483-E6C8-4D83-9CAB-98F2EDBD386D","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:33","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:33+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:33","data_id":"66B492E9-A00D-4EEB-A73F-281BCA2DF88C","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0449983,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:33","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:33+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:35","data_id":"80E843E6-B7CF-4FF4-A3C1-B556BB7C147A","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:35","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:35+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:35","data_id":"CCA68EEF-3D44-46E8-B007-A460FED31DD3","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0293364,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:35","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:35+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:37","data_id":"0EB97FBF-AC64-4708-AA58-338A55D39E62","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:37","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:37+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:37","data_id":"E10A3247-C55A-43D1-8AEC-179E06E42F64","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.020003,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:37","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:37+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:39","data_id":"67A8921C-3701-408D-84F2-5F50AF65D808","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0,"req_action":"QuerySimple","req_method":"OPTIONS","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:39","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:39+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 10:23:39","data_id":"9FB8FD5E-8578-4F68-B5DE-B95FF026066C","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0470839,"req_action":"QuerySimple","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 10:23:39","event_type":"101","event_uri":"/v1/report/QuerySimple","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T10:23:39+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 11:40:13","data_id":"FB8E1CF6-A65E-408D-A565-3D75023AFDE5","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.3600626,"req_action":"","req_method":"GET","status_code":200},"event_seqno":0,"event_time":"2020/08/05 11:40:13","event_type":"101","event_uri":"/docs/","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T11:40:13+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"192.168.0.200","access_way":-1,"collect_time":"2020/08/05 11:40:14","data_id":"AD9FB8C9-AAFB-4D76-AF8A-7222CDEB18A7","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0153109,"req_action":"common_left.html","req_method":"GET","status_code":200},"event_seqno":0,"event_time":"2020/08/05 11:40:14","event_type":"101","event_uri":"/docs/common_left.html","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T11:40:14+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"127.0.0.1","access_way":-1,"collect_time":"2020/08/05 14:53:42","data_id":"FDE27405-2F03-4948-983F-507A1D076A45","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.3949708,"req_action":"","req_method":"GET","status_code":200},"event_seqno":0,"event_time":"2020/08/05 14:53:42","event_type":"101","event_uri":"/docs/","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T14:53:42+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"127.0.0.1","access_way":-1,"collect_time":"2020/08/05 14:53:43","data_id":"809316E0-4F19-4827-8BC8-E7F53F4912D3","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.0019959,"req_action":"common_left.html","req_method":"GET","status_code":200},"event_seqno":0,"event_time":"2020/08/05 14:53:43","event_type":"101","event_uri":"/docs/common_left.html","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T14:53:43+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"127.0.0.1","access_way":-1,"collect_time":"2020/08/05 14:55:31","data_id":"30911E32-0A8E-4123-B973-B44E73A5F91B","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":39.2207617,"req_action":"DataexPage","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 14:54:52","event_type":"101","event_uri":"/v1/dataex/DataexPage","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T14:55:31+08:00","user_id":"-1"}
+{"access_id":"-1","access_ip":"127.0.0.1","access_way":-1,"collect_time":"2020/08/05 14:56:59","data_id":"CC92FB0E-E577-4A6D-83F5-8E597DBD2363","datasource_id":"log_dataex","event_name":"gin_webrequest","event_property":{"latency_time":0.1843213,"req_action":"DataexPage","req_method":"POST","status_code":200},"event_seqno":0,"event_time":"2020/08/05 14:56:58","event_type":"101","event_uri":"/v1/dataex/DataexPage","host":"7TUV5HM1526XNYZ","identity":"-1","level":"info","msg":"","system_id":"dsDataex","time":"2020-08-05T14:56:59+08:00","user_id":"-1"}