'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -306,7 +306,7 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	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
-	where t1.bureau_id=? and t1.identity_id=2 and t1.b_use=1 order t1.sort_id,t1.id_int`
+	where t1.bureau_id=? and t1.identity_id=2 and t1.b_use=1 order by t1.sort_id,t1.id_int`
 		list, _ := db.SQL(sql, bureauId).Query().List()
 		for i := range list {
 			record := list[i]

dsSso/Controller/ControllerOauth2/ControllerOauth2.go

@@ -382,7 +382,7 @@ func authorizeGet(context *gin.Context) {
 	if SsoSessionId != "" {
 		//取出UserData
 		identityId, personId, _ = SsoUtil.AnalyzeSessionId(SsoSessionId)
-		if ConvertUtil.StringToInt(identityId) > 0 && ConvertUtil.StringToInt(personId) > 0 {
+		if identityId != "" && personId != "" {
 			//为其生成授权码，并返回给客户端系统
 			generateAuthCode(context, identityId, personId, deviceId, "GET")
 			return