From b3e9202b84435a493b4c759957e117a9261d9301 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Wed, 2 Sep 2020 11:49:23 +0800
Subject: [PATCH] 'commit'

---
 .../RpcService/BaseClass/BaseClassDao/BaseClassDao.go     | 2 +-
 .../BaseOrganizationDao/BaseOrganizationDao.go            | 8 ++++++--
 .../BaseOrganizationService/BaseOrganizationService.go    | 6 +-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go b/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go
index 746ff2a4..eda3ee47 100644
--- a/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go
+++ b/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go
@@ -139,7 +139,7 @@ func GetStage(schoolId string) ([]map[string]interface{}, int32, error) {
 	}
 	var xxbxlxmArray = make([]string, len(fsbList)+1)
 	for i := range fsbList {
-		xxbxlxmArray[i] = fsbList[i]["fsxxbxlxm"].(string)
+		xxbxlxmArray[i] = fsbList[i]
 	}
 	xxbxlxmArray[len(fsbList)] = xxbxlxm
 
diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
index 9c10c03e..f84ef4c3 100644
--- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
+++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
@@ -581,10 +581,14 @@ func UpdateFsb(bureauId string, fsbCode []string) error {
 作者：黄海
 时间：2020-08-21
 */
-func GetFsb(bureauId string) ([]map[string]interface{}, error) {
+func GetFsb(bureauId string) ([]string, error) {
 	sql := `select * from t_base_school_fsb where b_use=1 and bureau_id=?`
 	list, err := db.SQL(sql, bureauId).Query().List()
-	return list, err
+	var res = make([]string, 0)
+	for i := range list {
+		res = append(res, list[i]["fsxxbxlxm"].(string))
+	}
+	return res, err
 }
 
 /**
diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
index 14b05808..6fd156d8 100644
--- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
+++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
@@ -47,11 +47,7 @@ func (s *Rpc) GetBaseOrganization(ctx context.Context, in *BaseOrganizationProto
 			LogUtil.Error(ErrorConst.SqlQueryError, "执行GetFsb时发生严重错误："+err.Error())
 			return &reply, err
 		}
-		if fsbArray != nil {
-			list[0]["fsb"] = fsbArray
-		} else {
-			list[0]["fsb"] = make([]map[string]interface{}, 0)
-		}
+		list[0]["fsb"] = fsbArray
 	}
 	//将结果序列化
 	reply.Success = true