'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -281,7 +281,7 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	f.AddDataValidation(SheetName, dvRange)
 
 	//部门
-	sql := "select org_name as dict_value from t_base_organization where bureau_id=? and b_use=1 and parent_id=bureau_id order by sort_id"
+	sql := "select org_name as dict_value from t_base_organization where bureau_id=? and b_use=1 and (parent_id=bureau_id or org_id=bureau_id) order by sort_id"
 	list, _ = db.SQL(sql, bureauId).Query().List()
 
 	if len(list) > 0 {
@@ -301,7 +301,7 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	}
 	if ExportExcelStatus > 0 {
 		//将现有数据填充到下载的模板中
-		sql := `select (case t2.org_type when 3 then t2.org_name else '' end) as org_name,t1.xm,
+		sql := `select  t2.org_name,t1.xm,
 	t1.mzm,t1.zzmmm,t1.sfzjlxm,	(case t1.sfzjh when '-1' then '' else t1.sfzjh  end ) as sfzjh,
 	t1.xlm,t1.xwm,t1.zcm,t1.bzlbm,t1.stage_id,t1.subject_id,t1.gwzym,t1.lxdh,t1.dzxx
 	from t_base_teacher as t1 inner join t_base_organization as t2 on t1.org_id=t2.org_id