diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
index 33679ace..648f1a2f 100644
--- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
+++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go
@@ -493,3 +493,17 @@ func DisableBureauManager(ids []string) error {
 
 	return nil
 }
+
+/**
+功能：判断一个组织机构是不是部门
+作者：黄海
+时间：2020-07-17
+ */
+func IsBuMen(orgId string) bool{
+	//判断是单位还是部门
+	list := SqlKit.QueryByIds([]string{orgId}, "t_base_organization")
+	if list[0]["org_type"].(int64)==3{
+		return true
+	}
+	return false
+}
\ No newline at end of file
diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
index 905f08f8..b381a2e2 100644
--- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
+++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go
@@ -45,9 +45,11 @@ func (s *Rpc) GetBaseOrganization(ctx context.Context, in *BaseOrganizationProto
 func (s *Rpc) AddBaseOrganization(ctx context.Context, in *BaseOrganizationProto.ModelArg) (*BaseOrganizationProto.Reply, error) {
 	//rpc响应
 	var reply BaseOrganizationProto.Reply
+	//是不是部门
+	isBuMen := false
 
-	//2:学校，7:教辅单位，8:大学区,不在2，7，8中，应该就是指部门
-	if in.OrgType == 2 || in.OrgType == 7 || in.OrgType == 8 {
+	//1:教育局,2:学校，7:教辅单位，8:大学区,不在1,2，7，8中，应该就是指部门
+	if in.OrgType == 1 || in.OrgType == 2 || in.OrgType == 7 || in.OrgType == 8 {
 		//1、检查非空
 		if len(in.OrgCode) == 0 {
 			reply.Success = false
@@ -67,6 +69,8 @@ func (s *Rpc) AddBaseOrganization(ctx context.Context, in *BaseOrganizationProto
 			reply.Message = "区域代码不存在，不能创建！"
 			return &reply, nil
 		}
+	} else {
+		isBuMen = true
 	}
 
 	//3、指定的org_code是否存在
@@ -95,7 +99,11 @@ func (s *Rpc) AddBaseOrganization(ctx context.Context, in *BaseOrganizationProto
 	}
 	if exist {
 		reply.Success = false
-		reply.Message = "单位/部门名称已存在，不能创建！"
+		if isBuMen {
+			reply.Message = "部门名称已存在，不能创建！"
+		} else {
+			reply.Message = "单位名称已存在，不能创建！"
+		}
 		return &reply, err
 	}
 	//5、调用dao
@@ -230,7 +238,7 @@ func (s *Rpc) DeleteBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 	//rpc响应
 	var reply BaseOrganizationProto.Reply
 
-	//遍历每一个单位/部门进行检查
+	//遍历每一个单位+部门进行检查
 	for i := range in.Ids {
 		//判断部门下是不是有可用的人员
 		var inTeacher BaseTeacherProto.QueryArg
@@ -247,7 +255,12 @@ func (s *Rpc) DeleteBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 		}
 		if count > 0 {
 			reply.Success = false
-			reply.Message = "单位/部门下存在教工数据，无法删除！"
+			//判断是单位还是部门
+			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId){
+				reply.Message = "部门下存在教工数据，无法删除！"
+			}else{
+				reply.Message = "单位下存在教工数据，无法删除！"
+			}
 			return &reply, err
 		}
 		//判断部门下是不是有可用的子部门
@@ -260,7 +273,12 @@ func (s *Rpc) DeleteBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 		}
 		if count > 0 {
 			reply.Success = false
-			reply.Message = "单位/部门下存在子部门，无法删除！"
+			//判断是单位还是部门
+			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId){
+				reply.Message = "部门下存在子部门，无法删除！"
+			}else{
+				reply.Message = "单位下存在子部门，无法删除！"
+			}
 			return &reply, err
 		}
 		//判断是不是有可用的班级
@@ -277,7 +295,12 @@ func (s *Rpc) DeleteBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 		}
 		if count > 0 {
 			reply.Success = false
-			reply.Message = "单位/部门下存在班级数据，无法删除！"
+			//判断是单位还是部门
+			if BaseOrganizationDao.IsBuMen(inTeacher.OrgId){
+				reply.Message = "部门下存在班级，无法删除！"
+			}else{
+				reply.Message = "单位下存在班级，无法删除！"
+			}
 			return &reply, err
 		}
 	}
@@ -333,13 +356,13 @@ func (s *Rpc) UpdateBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 	var reply BaseOrganizationProto.Reply
 	//1、指定的org_code是否存在
 	list := SqlKit.QueryByIds([]string{in.OrgId}, "t_base_organization")
-	if list==nil || len(list)==0{
+	if list == nil || len(list) == 0 {
 		reply.Success = false
 		reply.Message = "输入的OrgId无法找到对应的单位ID！"
 		return &reply, nil
 	}
 	//根据OrgId换取回bureau_id 黄海修改于2020-07-16
-	bureauId:=list[0]["bureau_id"].(string)
+	bureauId := list[0]["bureau_id"].(string)
 	exist, err := BaseOrganizationDao.IsExistOrgCode(in.OrgCode, bureauId, in.OrgType, in.OrgId)
 	if err != nil {
 		reply.Success = false
@@ -348,7 +371,6 @@ func (s *Rpc) UpdateBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 		return &reply, err
 	}
 
-
 	if exist {
 		reply.Success = false
 		reply.Message = "编码已存在，无法修改！"
@@ -364,7 +386,11 @@ func (s *Rpc) UpdateBaseOrganization(ctx context.Context, in *BaseOrganizationPr
 	}
 	if exist {
 		reply.Success = false
-		reply.Message = "单位/部门名称已存在，无法修改！"
+		if BaseOrganizationDao.IsBuMen(in.OrgId){
+			reply.Message = "部门名称已存在，无法修改！"
+		}else{
+			reply.Message = "单位名称已存在，无法修改！"
+		}
 		return &reply, err
 	}
 	//3、修改