Merge pull request #67 from teamones-open/fix_schema

weijer · web-flow · commit ea12261198ff · 2024-07-09T23:44:46.000+08:00
fixed: 复用model对象要初始化数据
diff --git a/src/think/Loader.php b/src/think/Loader.php
@@ -515,7 +515,9 @@ public static function model($name = '', $layer = 'model', $appendSuffix = false
         $uid = $name . $layer;
 
         if (isset(self::$_instance[$uid])) {
-            return self::$_instance[$uid];
+            $existModel = self::$_instance[$uid];
+            $existModel->resetDefault();
+            return $existModel;
         }
 
         list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix);

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,9 @@ public static function model($name = '', $layer = 'model', $appendSuffix = false`
`515`	`515`	`$uid = $name . $layer;`
`516`	`516`
`517`	`517`	`if (isset(self::$_instance[$uid])) {`
`518`		`- return self::$_instance[$uid];`
	`518`	`+ $existModel = self::$_instance[$uid];`
	`519`	`+ $existModel->resetDefault();`
	`520`	`+ return $existModel;`
`519`	`521`	`}`
`520`	`522`
`521`	`523`	`list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix);`