mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-04-29 10:49:36 +08:00
Synchronization code
This commit is contained in:
parent
c81ac9b305
commit
4b7d59adc8
@ -227,12 +227,17 @@ namespace SqlSugar
|
|||||||
var expResult = DeleteBuilder.GetExpressionValue(expression, ResolveExpressType.WhereSingle);
|
var expResult = DeleteBuilder.GetExpressionValue(expression, ResolveExpressType.WhereSingle);
|
||||||
var whereString = expResult.GetResultString();
|
var whereString = expResult.GetResultString();
|
||||||
if (expression.ToString().Contains("Subqueryable()")) {
|
if (expression.ToString().Contains("Subqueryable()")) {
|
||||||
|
var entityTableName = this.EntityInfo.DbTableName;
|
||||||
|
if (this.DeleteBuilder.AsName.HasValue())
|
||||||
|
{
|
||||||
|
entityTableName = this.DeleteBuilder.AsName;
|
||||||
|
}
|
||||||
if (ExpressionTool.GetParameters(expression).First().Type == typeof(T))
|
if (ExpressionTool.GetParameters(expression).First().Type == typeof(T))
|
||||||
{
|
{
|
||||||
var tableName = this.SqlBuilder.GetTranslationColumnName(this.EntityInfo.DbTableName);
|
var tableName = this.SqlBuilder.GetTranslationColumnName(entityTableName);
|
||||||
whereString = whereString.Replace(tableName, $"( SELECT * FROM {tableName}) ");
|
whereString = whereString.Replace(tableName, $"( SELECT * FROM {tableName}) ");
|
||||||
}
|
}
|
||||||
whereString = whereString.Replace(this.SqlBuilder.GetTranslationColumnName(expression.Parameters.First().Name) + ".", this.SqlBuilder.GetTranslationTableName(this.EntityInfo.DbTableName) + ".");
|
whereString = whereString.Replace(this.SqlBuilder.GetTranslationColumnName(expression.Parameters.First().Name) + ".", this.SqlBuilder.GetTranslationTableName(entityTableName) + ".");
|
||||||
}
|
}
|
||||||
else if (expResult.IsNavicate)
|
else if (expResult.IsNavicate)
|
||||||
{
|
{
|
||||||
|
@ -784,12 +784,17 @@ namespace SqlSugar
|
|||||||
var whereString = expResult.GetResultString();
|
var whereString = expResult.GetResultString();
|
||||||
if (expression.ToString().Contains("Subqueryable()"))
|
if (expression.ToString().Contains("Subqueryable()"))
|
||||||
{
|
{
|
||||||
|
var entityTableName = this.EntityInfo.DbTableName;
|
||||||
|
if (UpdateBuilder.TableName.HasValue())
|
||||||
|
{
|
||||||
|
entityTableName = UpdateBuilder.TableName;
|
||||||
|
}
|
||||||
if (ExpressionTool.GetParameters(expression).First().Type == typeof(T))
|
if (ExpressionTool.GetParameters(expression).First().Type == typeof(T))
|
||||||
{
|
{
|
||||||
var tableName = this.SqlBuilder.GetTranslationColumnName(this.EntityInfo.DbTableName);
|
var tableName = this.SqlBuilder.GetTranslationColumnName(entityTableName);
|
||||||
whereString = whereString.Replace(tableName, $"( SELECT * FROM {tableName}) ");
|
whereString = whereString.Replace(tableName, $"( SELECT * FROM {tableName}) ");
|
||||||
}
|
}
|
||||||
whereString = whereString.Replace(this.SqlBuilder.GetTranslationColumnName(expression.Parameters.First().Name) + ".", this.SqlBuilder.GetTranslationTableName(this.EntityInfo.DbTableName) + ".");
|
whereString = whereString.Replace(this.SqlBuilder.GetTranslationColumnName(expression.Parameters.First().Name) + ".", this.SqlBuilder.GetTranslationTableName(entityTableName) + ".");
|
||||||
}
|
}
|
||||||
else if (expResult.IsNavicate)
|
else if (expResult.IsNavicate)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user