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 73f86b87..22c5b00b 100644 --- a/dsBaseRpc/Tools/MockData/MockData.go +++ b/dsBaseRpc/Tools/MockData/MockData.go @@ -241,6 +241,7 @@ 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