From 2d4863aedcc340467606e8cad2b593bb538daa2d Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Thu, 6 Aug 2020 09:52:05 +0800
Subject: [PATCH] 'commit'

---
 dsBaseRpc/Config/Config.ini                                  | 3 ---
 .../RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go  | 2 +-
 dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go                     | 5 +----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dsBaseRpc/Config/Config.ini b/dsBaseRpc/Config/Config.ini
index 62bd776f..acb64118 100644
--- a/dsBaseRpc/Config/Config.ini
+++ b/dsBaseRpc/Config/Config.ini
@@ -27,9 +27,6 @@ port = 8001
 [project]
 project_name = dsBaseRpc
 
-[kafka]
-KafkaAddress = server.dsmin.com:9092
-
 # 数据汇集的地址
 [dataExchange]
 host                = http://10.10.14.186:9009
diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
index 732944ab..442bd9b7 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
@@ -1041,7 +1041,7 @@ func getOrgNameMap(bureauId string) (map[string]string, error) {
 作者：黄海
 时间：2020-08-05
 */
-func InsertTeacherOrgInfo(personIds []string, orgId string, isMain int32) (bool, string, error) {
+func AddTeacherOrgInfo(personIds []string, orgId string, isMain int32) (bool, string, error) {
 	//(1)获取单位ID
 	list := SqlKit.QueryByIds([]string{orgId}, "t_base_organization")
 	if len(list) == 0 {
diff --git a/dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go b/dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go
index e100b3e0..b631497f 100644
--- a/dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go
+++ b/dsBaseRpc/Utils/ConfigUtil/ConfigUtil.go
@@ -36,8 +36,6 @@ var (
 	RpcServerPort string
 	//项目名称
 	ProjectName string
-	//kafka地址
-	KafkaAddress string
 
 	//数据汇集中心地址
 	DataExchangeHost          string
@@ -93,8 +91,7 @@ func init() {
 	RpcServerPort = iniParser.GetString("rpcServer", "port")
 	//项目名称
 	ProjectName = iniParser.GetString("project", "project_name")
-	//kafka地址
-	KafkaAddress = iniParser.GetString("kafka", "KafkaAddress")
+
 	//数据汇集中心地址
 	DataExchangeHost = iniParser.GetString("dataExchange", "host")
 	DataExchangeUrl = DataExchangeHost + iniParser.GetString("dataExchange", "exchangeUrl")