Update mongodb

This commit is contained in:
sunkaixuan
2025-09-08 17:35:02 +08:00
parent d5b76e9f33
commit 338b340a23
2 changed files with 40 additions and 24 deletions

View File

@@ -259,8 +259,7 @@ namespace SqlSugar.MongoDb
if (name == "ToDateTime") if (name == "ToDateTime")
name = "ToDate"; name = "ToDate";
if (name == "Contains" && methodCallExpression.Arguments.Count == 1 if (name == "Contains" && methodCallExpression.Arguments.Count == 1
&& methodCallExpression?.Object?.Type != null && methodCallExpression?.Object?.Type != null
&& ExpressionTool.GetParameters(methodCallExpression.Object).Count == 0
&& typeof(IEnumerable).IsAssignableFrom(methodCallExpression.Object.Type)) && typeof(IEnumerable).IsAssignableFrom(methodCallExpression.Object.Type))
{ {
name = "ContainsArray"; name = "ContainsArray";

View File

@@ -701,36 +701,53 @@ namespace SqlSugar.MongoDb
// 获取字段名 // 获取字段名
BsonValue fieldName = new ExpressionVisitor(context).Visit(itemExp); BsonValue fieldName = new ExpressionVisitor(context).Visit(itemExp);
var isConstValue = ExpressionTool.GetParameters(arrayExp).Count == 0;
// 获取数组值 // 获取数组值
var arrayObj = ExpressionTool.DynamicInvoke(arrayExp) as IEnumerable; IEnumerable arrayObj = null;
if (arrayObj == null) if (isConstValue)
return null;
var name=fieldName.ToString();
// 构建BsonArray
var bsonArray = new BsonArray();
foreach (var val in arrayObj)
{ {
if (val == null) arrayObj = ExpressionTool.DynamicInvoke(arrayExp) as IEnumerable;
bsonArray.Add(BsonNull.Value); if (arrayObj == null)
else if (name == "_id") return null;
var name = fieldName.ToString();
// 构建BsonArray
var bsonArray = new BsonArray();
foreach (var val in arrayObj)
{ {
var value = val?.ToString(); if (val == null)
if (UtilMethods.IsValidObjectId(value)) bsonArray.Add(BsonNull.Value);
else if (name == "_id")
{ {
bsonArray.Add(UtilMethods.MyCreate(ObjectId.Parse(value))); var value = val?.ToString();
if (UtilMethods.IsValidObjectId(value))
{
bsonArray.Add(UtilMethods.MyCreate(ObjectId.Parse(value)));
}
else
{
bsonArray.Add(UtilMethods.MyCreate(val));
}
} }
else else
{
bsonArray.Add(UtilMethods.MyCreate(val)); bsonArray.Add(UtilMethods.MyCreate(val));
}
} }
else
bsonArray.Add(UtilMethods.MyCreate(val));
}
// 构建MongoDB的 $in 查询表达式 // 构建MongoDB的 $in 查询表达式
var inDoc = new BsonDocument(name, new BsonDocument("$in", bsonArray)); var inDoc = new BsonDocument(name, new BsonDocument("$in", bsonArray));
return inDoc.ToJson(UtilMethods.GetJsonWriterSettings()); return inDoc.ToJson(UtilMethods.GetJsonWriterSettings());
}
else
{
// 数组表达式不是常量需生成MongoDB $in表达式数组字段为arrayExp判断itemExp是否在数组中
// 获取字段名
var name = fieldName.ToString();
// 获取数组字段名
BsonValue arrayField = new ExpressionVisitor(context).Visit(arrayExp);
// 构建MongoDB的 $in 查询表达式,格式为 { "$in": [ "$_id", "$$let_RoleIds" ] }
var inArray = new BsonArray { name, arrayField };
var inDoc = new BsonDocument("$in", inArray);
return inDoc.ToJson(UtilMethods.GetJsonWriterSettings());
}
} }
public override string ContainsArrayUseSqlParameters(MethodCallExpressionModel model) public override string ContainsArrayUseSqlParameters(MethodCallExpressionModel model)