diff --git a/Logs/dsSupport.log b/Logs/dsSupport.log
index 9f865fa8..cde34f2d 100644
--- a/Logs/dsSupport.log
+++ b/Logs/dsSupport.log
@@ -163,3 +163,5 @@
 [Error]2020/09/21 17:29:21 SqlQueryError 	 数据库操作发生严重错误：Error 1054: Unknown column 'code' in 'where clause'
 [Error]2020/09/22 11:26:20 SqlQueryError 	 数据库操作发生严重错误：Error 1054: Unknown column 'code' in 'where clause'
 [Error]2020/09/22 11:29:40 SqlQueryError 	 数据库操作发生严重错误：Error 1054: Unknown column 'code' in 'where clause'
+[Error]2020/09/28 16:50:13 获取组织机构列表错误:  	 rpc error: code = DeadlineExceeded desc = context deadline exceeded
+[Error]2020/09/28 16:51:58 获取组织机构列表错误:  	 rpc error: code = DeadlineExceeded desc = context deadline exceeded
diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
index 29a8740e..4779d79f 100644
--- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
+++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
@@ -132,12 +132,13 @@ func PageBaseOrganization(in *BaseOrganizationProto.QueryArg) ([]map[string]inte
 		InnerJoin("t_sys_loginperson as t3", "t2.person_id=t3.person_id")
 	//是市，还是区？
 	areaCode := in.AreaCode
-	//1是教育局，需要要城市及所辖县区的教育局
-	if in.OrgType == 1 || in.OrgType == -1 {
+
+	if areaCode[4:] == "00" { //市
 		myBuilder.Where(builder.Eq{"t1.city_code": areaCode})
-	} else {
-		myBuilder.Where(builder.Eq{"t1.area_code": areaCode})
+	} else { //区
+		myBuilder.Where(builder.Eq{"t1.district_code": areaCode})
 	}
+
 	//是全部，还是要启用，禁用的？
 	if in.BUse != 0 {
 		myBuilder.Where(builder.Eq{"t1.b_use": in.BUse})