新增处理支持deletedAt查询

entity.go

@@ -5,6 +5,7 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
+	"gorm.io/gorm/schema"
 	"path"
 	"reflect"
 	"strconv"
@@ -354,6 +355,10 @@ func (e *Entity) isKvMapping() bool {
 
 // getMappingValue 获取映射值
 func (e *Entity) getMappingValue(namespace string) []mappingValue {
+	var (
+		deletedAtField *schema.Field
+		query          *gorm.DB
+	)
 	if !e.isKvMapping() {
 		return nil
 	}
@@ -361,7 +366,12 @@ func (e *Entity) getMappingValue(namespace string) []mappingValue {
 		return v.([]mappingValue)
 	}
 	values := make([]mappingValue, 0)
-	if err := e.opts.DB.Select(e.mappingLabelField+" AS label", e.mappingValueField+" AS value").Where("namespace=?", namespace).Table(e.model.TableName()).Scan(&values).Error; err == nil {
+	query = e.opts.DB.Select(e.mappingLabelField+" AS label", e.mappingValueField+" AS value")
+	//添加支持deletedAt功能逻辑
+	if deletedAtField = e.statement.Schema.LookUpField("DeletedAt"); deletedAtField != nil {
+		query.Where(map[string]interface{}{deletedAtField.DBName: nil})
+	}
+	if err := query.Where("namespace=?", namespace).Table(e.model.TableName()).Scan(&values).Error; err == nil {
 		e.lruCache.Add(namespace+":mappingValue", values)
 	}
 	return values