- 忧化 GroupBySelf.Where 自动转 having；

Author: 2881099

FreeSql/FreeSql.xml

@@ -1032,6 +1032,7 @@ public TSelect AsType(Type entityType)
         public TSelect WhereIf(bool condition, string sql, object parms = null)
         {
             if (condition == false || string.IsNullOrEmpty(sql)) return this as TSelect;
+            if (_groupBySelfFlag) return this.Having(sql, parms);
             _where.Append(" AND (").Append(sql).Append(")");
             if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
             return this as TSelect;

FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs

@@ -851,8 +851,10 @@ public ISelectGrouping<TKey, TValue> InternalGroupBy<TKey, TValue>(Expression co
             this.GroupBy(sql.Length > 0 ? sql.Substring(2) : null);
             return new SelectGroupingProvider<TKey, TValue>(_orm, this, map, sql, _commonExpression, _tables);
         }
+        bool _groupBySelfFlag = false;
         public TSelect InternalGroupBySelf(Expression column)
         {
+            _groupBySelfFlag = true;
             if (column.NodeType == ExpressionType.Lambda) column = (column as LambdaExpression)?.Body;
             switch (column?.NodeType)
             {