From a29420299a766a98e498baa5df1c66734329d722 Mon Sep 17 00:00:00 2001
From: "as2252258@163.com" <as22522582>
Date: Sun, 28 Feb 2021 00:50:30 +0800
Subject: [PATCH] modify

---
 Database/Condition/Condition.php |  8 --------
 Database/Traits/Builder.php      | 12 +++++++-----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Database/Condition/Condition.php b/Database/Condition/Condition.php
index 39ca3e12..dfbc6974 100644
--- a/Database/Condition/Condition.php
+++ b/Database/Condition/Condition.php
@@ -47,17 +47,9 @@ abstract class Condition extends BaseObject
      */
     public function setValue($params): void
     {
-        if (is_object($params)) {
-            var_dump($params);
-            $params = get_object_vars($params);
-        };
         if (is_array($params)) {
             $values = [];
             foreach ($params as $item => $value) {
-                if (is_object($value)) {
-                    var_dump($value);
-                    continue;
-                };
                 $values[$item] = is_numeric($value) ? $value : '\'' . $value . '\'';
             }
             $this->value = $value;
diff --git a/Database/Traits/Builder.php b/Database/Traits/Builder.php
index c05cedc1..85de9ee1 100644
--- a/Database/Traits/Builder.php
+++ b/Database/Traits/Builder.php
@@ -200,15 +200,17 @@ trait Builder
 			if (!is_string($condition[2])) {
 				$condition[2] = $this->_hashMap($condition[2]);
 			}
-			return Snowflake::createObject(['class' => OrCondition::class, 'value' => $condition[2], 'column' => $condition[1], 'oldParams' => $array]);
-		}
-		if (isset(ConditionClassMap::$conditionMap[$stroppier])) {
+			$builder = Snowflake::createObject(['class' => OrCondition::class, 'value' => $condition[2], 'column' => $condition[1], 'oldParams' => $array]);
+		}else  if (isset(ConditionClassMap::$conditionMap[$stroppier])) {
 			$defaultConfig = ConditionClassMap::$conditionMap[$stroppier];
 			$create = array_merge($defaultConfig, ['column' => $condition[1], 'value' => $condition[2]]);
-			$array[] = Snowflake::createObject($create);
+            $builder = Snowflake::createObject($create);
 		} else {
-			$array[] = Snowflake::createObject(['class' => HashCondition::class, 'value' => $condition]);
+            $builder = Snowflake::createObject(['class' => HashCondition::class, 'value' => $condition]);
 		}
+
+		$array[] = $builder->builder();
+
 		return implode(' AND ', $array);
 	}