From c7394b78e7aaa38233ff05cd98ba2e92aaa5d8fa Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Sat, 16 Mar 2019 08:32:35 +0800
Subject: [PATCH] =?UTF-8?q?MySql=20=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FreeSql/MySql/Curd/MySqlSelect.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/FreeSql/MySql/Curd/MySqlSelect.cs b/FreeSql/MySql/Curd/MySqlSelect.cs
index 8950a163..a73bcdc5 100644
--- a/FreeSql/MySql/Curd/MySqlSelect.cs
+++ b/FreeSql/MySql/Curd/MySqlSelect.cs
@@ -48,9 +48,8 @@ namespace FreeSql.MySql.Curd {
 						sb.Append(" \r\nRIGHT JOIN ");
 						break;
 				}
-				sb.Append(_commonUtils.QuoteSqlName(tableRuleInvoke(tb.Table.Type, tb.Table.DbName))).Append(" ").Append(tb.Alias).Append(" ON ").Append(tb.On);
-				if (!string.IsNullOrEmpty(tb.NavigateCondition)) sbnav.Append(" AND (").Append(tb.NavigateCondition).Append(")");
-				if (!string.IsNullOrEmpty(tb.On)) sbnav.Append(" AND (").Append(tb.On).Append(")");
+				sb.Append(_commonUtils.QuoteSqlName(tableRuleInvoke(tb.Table.Type, tb.Table.DbName))).Append(" ").Append(tb.Alias).Append(" ON ").Append(tb.On ?? tb.NavigateCondition);
+				if (!string.IsNullOrEmpty(tb.On) && !string.IsNullOrEmpty(tb.NavigateCondition)) sbnav.Append(" AND (").Append(tb.NavigateCondition).Append(")");
 			}
 			if (_join.Length > 0) sb.Append(_join);