'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -96,7 +96,7 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
 	var offset = int((in.Page - 1) * in.Limit)
 	// 注意使用limit时要使用方言
 	// 注意两个表关联时的on用法：
-	var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.*").
+	var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.*,t2.bureau_id,t2.org_id").
 		From("t_base_teacher as t1").LeftJoin("t_base_teacher_org as t2", "t1.person_id=t2.person_id").
 		OrderBy("t2.sort_id")
 	//所在单位ID

dsBaseRpc/Tools/FillTeacherOrg/FillTeacherOrg.go

@@ -33,7 +33,11 @@ func main() {
 			model.MainSchoolId = list[i]["mainschool_id"].(string)
 		}
 		model.BUse = int32(list[i]["b_use"].(int64))
-		db.Insert(model)
+		_,err:=db.Insert(model)
+		if err!=nil{
+			fmt.Println("发生致命错误："+err.Error())
+			panic(err)
+		}
 	}
 	fmt.Println("恭喜，数据迁移成功完成！")
 }