From 43dc0fe9b5be8f80db4ecfe6252a67ed19c6444b Mon Sep 17 00:00:00 2001
From: laoqiu <laoqiu@QiuLiangdeMacBook-Pro.local>
Date: Tue, 30 Apr 2024 16:13:30 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20Get=E5=87=BD=E6=95=B0=E5=9C=A8=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E6=97=B6=E6=9C=AA=E7=BB=99=E5=AE=9ATable=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=EF=BC=8C=E6=97=A0=E6=B3=95=E6=8C=89=E9=A2=84=E6=9C=9F?=
 =?UTF-8?q?=E5=AF=B9deleted=E6=9D=A1=E4=BB=B6merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/statements/pk.go    | 9 +++++++++
 internal/statements/query.go | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/internal/statements/pk.go b/internal/statements/pk.go
index 59da89c0..4f5f36b7 100644
--- a/internal/statements/pk.go
+++ b/internal/statements/pk.go
@@ -96,3 +96,12 @@ func (statement *Statement) ProcessIDParam() error {
 	}
 	return nil
 }
+
+func (statement *Statement) ProcessAutoCond() error {
+	if statement.RefTable != nil {
+		if col := statement.RefTable.DeletedColumn(); col != nil && !statement.GetUnscoped() { // tag "deleted" is enabled
+			statement.cond = statement.CondDeleted(col)
+		}
+	}
+	return nil
+}
diff --git a/internal/statements/query.go b/internal/statements/query.go
index e817403c..a10af130 100644
--- a/internal/statements/query.go
+++ b/internal/statements/query.go
@@ -117,6 +117,9 @@ func (statement *Statement) GenGetSQL(bean interface{}) (string, []interface{},
 		if err := statement.ProcessIDParam(); err != nil {
 			return "", nil, err
 		}
+		if err := statement.ProcessAutoCond(); err != nil {
+			return "", nil, err
+		}
 	}
 
 	buf := builder.NewWriter()