From beaccc0ef37085a3a1835acd72ee5f04b9571775 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Fri, 17 Jul 2020 16:24:48 +0800
Subject: [PATCH] 'commit'

---
 .../BaseOrganizationService/BaseOrganizationService.go      | 6 +++---
 .../RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
index b381a2e2..8bd39671 100644
--- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
+++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
@@ -53,7 +53,7 @@ func (s *Rpc) AddBaseOrganization(ctx context.Context, in *BaseOrganizationProto
 		//1、检查非空
 		if len(in.OrgCode) == 0 {
 			reply.Success = false
-			reply.Message = "编码代码为空，不能创建！"
+			reply.Message = "代码为空，不能创建！"
 			return &reply, nil
 		}
 		//2、检查AreaCode是否存在，不存在需要提示
@@ -85,7 +85,7 @@ func (s *Rpc) AddBaseOrganization(ctx context.Context, in *BaseOrganizationProto
 	}
 	if exist {
 		reply.Success = false
-		reply.Message = "编码已存在，无法创建！"
+		reply.Message = "代码已存在，无法创建！"
 		return &reply, err
 	}
 
@@ -373,7 +373,7 @@ func (s *Rpc) UpdateBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 
 	if exist {
 		reply.Success = false
-		reply.Message = "编码已存在，无法修改！"
+		reply.Message = "代码已存在，无法修改！"
 		return &reply, err
 	}
 	//2、检查机构名称是否存在,否则在导入人员时，不知道向哪个单位下进行导入
diff --git a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
index d5b34cc3..b14df740 100644
--- a/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
+++ b/dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go
@@ -103,7 +103,7 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
 	//所在单位ID
 	list := SqlKit.QueryByIds([]string{in.OrgId}, "t_base_organization")
 	if list == nil {
-		return nil, 0, errors.New("没有找到此单位编码！")
+		return nil, 0, errors.New("没有找到此单位代码！")
 	}
 	bureauId := list[0]["bureau_id"].(string)
 	if in.OrgId == bureauId {