'commit'

dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go

@@ -198,7 +198,7 @@ func IsExistOrgCode(orgCode string, bureauId string, orgType int32, withOutOrgId
 	myBuilder = myBuilder.Where(builder.Eq{"org_code": orgCode}).And(builder.Eq{"b_use": 1})
 
 	//如果需要在指定单位下检查,部门级
-	if orgType == 1 && orgType != 2 && orgType != 7 && orgType != 8 {
+	if orgType != 1 && orgType != 2 && orgType != 7 && orgType != 8 {
 		myBuilder = myBuilder.Where(builder.Eq{"bureau_id": bureauId})
 	}
 
@@ -502,7 +502,7 @@ func DisableBureauManager(ids []string) error {
 func IsBuMen(orgId string) bool{
 	//判断是单位还是部门
 	list := SqlKit.QueryByIds([]string{orgId}, "t_base_organization")
-	if list[0]["org_type"].(int64)==3{
+	if list[0]["org_type"].(float64)==3{
 		return true
 	}
 	return false

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go

@@ -20,7 +20,6 @@ import (
 	"dsBaseRpc/Utils/PinYinUtil"
 	"dsBaseRpc/Utils/SqlKit"
 	"dsBaseRpc/models"
-	"time"
 )
 
 type Rpc struct{} //服务对象
@@ -33,7 +32,7 @@ func (s *Rpc) GetBaseTeacher(ctx context.Context, in *BaseTeacherProto.ModelArg)
 	list := SqlKit.QueryByIds([]string{in.PersonId}, "t_base_teacher")
 	//处理从教年月
 	if len(list)>0{
-		if list[0]["csrq"].(time.Time).Year()==1900{
+		if list[0]["csrq"].(string)[0:4]=="1900"{
 			list[0]["csrq"]=""
 		}
 	}

dsBaseRpc/t_base_organization.log

@@ -1 +0,0 @@
-{}