From 722722a99eeb5e79074673b534f5b9d89db74898 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Fri, 21 Aug 2020 09:56:44 +0800
Subject: [PATCH] 'commit'

---
 .../BaseClass/BaseClassDao/BaseClassDao.go     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go b/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go
index a83d6aa7..5e7151a6 100644
--- a/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go
+++ b/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go
@@ -131,11 +131,23 @@ func GetStage(schoolId string) ([]map[string]interface{}, int32, error) {
 		return nil, 0, errors.New("无法找到此学校id。")
 	}
 	xxbxlxm := list[0]["xxbxlxm"].(string)
-	//2、根据办学类型，查找所有的学段
-	var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.stage_id,t2.stage_name").
+
+	//2、此学校的附设班有哪些
+	fsbList, err := BaseOrganizationDao.GetFsb(schoolId)
+	if err != nil {
+		return nil, -1, err
+	}
+	var xxbxlxmArray = make([]string, len(fsbList)+1)
+	for i := range fsbList {
+		xxbxlxmArray[i] = fsbList[i]["fsxxbxlxm"].(string)
+	}
+	xxbxlxmArray[len(fsbList)] = xxbxlxm
+
+	//3、根据办学类型，查找所有的学段
+	var myBuilder = builder.Dialect(builder.MYSQL).Select("distinct t1.stage_id,t2.stage_name").
 		From("t_dm_stage_xxbxlxm as t1").
 		InnerJoin("t_dm_stage as t2", "t1.stage_id=t2.stage_id").
-		Where(builder.Eq{"t1.xxbxlxm": xxbxlxm}).
+		Where(builder.In("t1.xxbxlxm", xxbxlxmArray)).
 		And(builder.Eq{"t1.b_use": 1}).
 		And(builder.Eq{"t2.b_use": 1}).
 		OrderBy("t2.sort_id")