'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -97,8 +97,7 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
 	// 注意两个表关联时的on用法：
 	var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.*").
 		From("t_base_teacher as t1").
-		LeftJoin("t_base_teacher_org as t2", "t1.person_id=t2.person_id").
-		OrderBy("t1.sort_id").OrderBy("t1.id_int")
+		OrderBy("t1.sort_id")
 	//所在单位ID
 	list := SqlKit.QueryByIds([]string{in.OrgId}, "t_base_organization")
 	if list == nil {
@@ -107,10 +106,10 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
 	bureauId := list[0]["bureau_id"].(string)
 	if in.OrgId == bureauId {
 		//如果是单位ID
-		myBuilder.And(builder.Eq{"t2.bureau_id": in.OrgId}.Or(builder.Eq{"t1.bureau_id": in.OrgId}))
+		myBuilder.And(builder.Eq{"t1.bureau_id": in.OrgId})
 	} else {
 		//如果是部门ID
-		myBuilder.And(builder.Eq{"t2.org_id": in.OrgId}.Or(builder.Eq{"t1.org_id": in.OrgId}))
+		myBuilder.And(builder.Eq{"t1.org_id": in.OrgId})
 	}
 	//姓名模糊搜索
 	myBuilder.And(builder.Like{"t1.xm", in.Xm})
@@ -446,7 +445,7 @@ func readToTable(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[s
 		//身份证件类型
 		m.Sfzjlxm = SysDictKit.MapDictKindChineseToCode["sfzjlxm_"+row[4]]
 		//身份证件号
-		m.Sfzjh =CommonUtil.CompressStr(row[5])
+		m.Sfzjh = CommonUtil.CompressStr(row[5])
 		//学历
 		m.Xlm = SysDictKit.MapDictKindChineseToCode["xlm_"+row[6]]
 		//学位