Merge remote-tracking branch 'origin/master'

Database/Base/BaseActiveRecord.php

@@ -434,7 +434,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
         $trance = $dbConnection->beginTransaction();
         try {
             if (!($lastId = (int)$dbConnection->createCommand($sql, $param)->save(true, $this))) {
-				throw new Exception('保存失败.' . $sql);
+                throw new Exception('保存失败.');
             }
             $trance->commit();
             $lastId = $this->setPrimary($lastId, $param);
@@ -794,16 +794,16 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
      */
     public function __set($name, $value)
     {
-		if (!$this->has($name)) {
+        if (method_exists($this, 'set' . ucfirst($name))) {
-			parent::__set($name, $value);
+            $this->{'set' . ucfirst($name)}($value);
-			return;
+        } else {
-		}
             $method = $this->_get_annotation($name, self::SET);
             if (!empty($method)) {
                 $value = $this->{$method}($value);
             }
             $this->_attributes[$name] = $value;
         }
+    }
 
 
     /**

Database/Mysql/Columns.php

@@ -112,7 +112,7 @@ class Columns extends Component
 	 */
 	public function decode($val, $format = null): mixed
 	{
-		if (empty($format)) {
+		if (empty($format) || $val === null) {
 			return $val;
 		}
 		$format = strtolower($format);