diff --git a/dsBaseRpc/DataExchange/DataExchange.go b/dsBaseRpc/DataExchange/DataExchange.go index ecfb0875..4130ba2b 100644 --- a/dsBaseRpc/DataExchange/DataExchange.go +++ b/dsBaseRpc/DataExchange/DataExchange.go @@ -3,6 +3,7 @@ package DataExchange import ( "bytes" "crypto/md5" + "dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao" "dsBaseRpc/Utils/CommonUtil" "dsBaseRpc/Utils/ConfigUtil" "dsBaseRpc/Utils/DbUtil" @@ -315,6 +316,10 @@ func PostToServer(t tableStruct, list []map[string]interface{}) bool { delete(list[k], "del_flag") ds.OrgId = list[k]["bureau_id"].(string) + //如果是市,县管理员的话,那么这里的bureau_id就是区域码,而数据交换平台只认t_base_organization表中的org_id,需要换算一下 + if len(ds.OrgId)==6{ + ds.OrgId=BaseOrganizationDao.GetMasterJiaoYuJu(ds.OrgId).OrgId + } dsMap = append(dsMap, ds) } ps.Datas = dsMap diff --git a/dsBaseRpc/models/t_base_teacher_org.go b/dsBaseRpc/models/t_base_teacher_org.go index 1ffa8125..392fa64b 100644 --- a/dsBaseRpc/models/t_base_teacher_org.go +++ b/dsBaseRpc/models/t_base_teacher_org.go @@ -11,5 +11,5 @@ type TBaseTeacherOrg struct { DistrictCode string `xorm:"not null default '''' comment('所在区行政区划码') CHAR(6)"` MainSchoolId string `xorm:"not null default '''' comment('主校ID') CHAR(36)"` SortId int32 `xorm:"not null comment('排序号(在获取信息时如果排序号大于9999,前台不显示)') INT(11)"` - IsMain int32 `xorm:"not null default 1 comment('是不是主单位、主部门') INT(255)"` + IsMain int32 `xorm:"not null default 1 comment('是不是主单位、主部门,待删除') INT(255)"` }