From 119bcbd27e48a8b1ce6882977e58cac858224a6b Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Tue, 7 Jul 2020 14:05:48 +0800
Subject: [PATCH 1/2] 'commit'

---
 dsBaseRpc/Tools/MockData/MockData.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dsBaseRpc/Tools/MockData/MockData.go b/dsBaseRpc/Tools/MockData/MockData.go
index 73f86b87..d4c1300b 100644
--- a/dsBaseRpc/Tools/MockData/MockData.go
+++ b/dsBaseRpc/Tools/MockData/MockData.go
@@ -241,7 +241,8 @@ func addSchool(areaCode string, jiaoYuJuId string, areaName string, provinceCode
 		model.BUse = 1
 		model.Xxbxlxm = "312" //九年一贯制
 		arrayTBaseOrganization = append(arrayTBaseOrganization, *model)
-
+		model.MainSchoolType = 1
+		
 		var c schoolStruct
 		c.SchoolId = model.OrgId
 		c.SchoolName = model.OrgName

From 3431bd0933236f7b61e565816dea0ead54b0a220 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Tue, 7 Jul 2020 14:22:47 +0800
Subject: [PATCH 2/2] 'commit'

---
 .../BaseOrganizationDao/BaseOrganizationDao.go                | 4 ++++
 dsBaseRpc/Tools/MockData/MockData.go                          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
index e1bfb5a2..1e116314 100644
--- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
+++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
@@ -156,6 +156,10 @@ func PageBaseOrganization(in *BaseOrganizationProto.QueryArg) ([]map[string]inte
 	//只查主校+普通校
 	if in.IsMainSchool {
 		myBuilder.Where(builder.In("t1.main_school_type", []int{1, 2}))
+		//如果要排除某个学校
+		if in.BureauId!=""{
+			myBuilder.Where(builder.Neq{"t1.org_id":in.BureauId})
+		}
 	}
 	myBuilder.Where(builder.Like{"t1.org_name", in.OrgName}).OrderBy("t1.sort_id asc,t1.id_int asc")
 	//关键字查询
diff --git a/dsBaseRpc/Tools/MockData/MockData.go b/dsBaseRpc/Tools/MockData/MockData.go
index d4c1300b..22c5b00b 100644
--- a/dsBaseRpc/Tools/MockData/MockData.go
+++ b/dsBaseRpc/Tools/MockData/MockData.go
@@ -242,7 +242,7 @@ func addSchool(areaCode string, jiaoYuJuId string, areaName string, provinceCode
 		model.Xxbxlxm = "312" //九年一贯制
 		arrayTBaseOrganization = append(arrayTBaseOrganization, *model)
 		model.MainSchoolType = 1
-		
+
 		var c schoolStruct
 		c.SchoolId = model.OrgId
 		c.SchoolName = model.OrgName