修复生成模型时-override指定为非bool值，可能有文件没生成的问题

imiphp · Feb 19, 2019 · 0bd4fe2 · 0bd4fe2
1 parent 0c7d962
commit 0bd4fe2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Tool/Tools/Generate/Model/ModelGenerate.php b/src/Tool/Tools/Generate/Model/ModelGenerate.php
@@ -95,14 +95,15 @@ public function generate($namespace, $database, $poolName, $prefix, $include, $e
             $fields = $query->bindValue(':table', $table)->execute('show full columns from ' . $table)->getArray();
             $this->parseFields($fields, $data, 'VIEW' === $item['TABLE_TYPE']);
 
-            if(true === $override || 'base' === $override)
+            $baseFileName = File::path($baseModelPath, $className . 'Base.php');
+            if(!is_file($baseFileName) || true === $override || 'base' === $override)
             {
                 echo 'Generating ', $table, ' BaseClass...', PHP_EOL;
                 $baseContent = $this->renderTemplate('base-template', $data);
-                file_put_contents(File::path($baseModelPath, $className . 'Base.php'), $baseContent);
+                file_put_contents($baseFileName, $baseContent);
             }
 
-            if(true === $override || 'model' === $override)
+            if(!is_file($fileName) || true === $override || 'model' === $override)
             {
                 echo 'Generating ', $table, ' Class...', PHP_EOL;
                 $content = $this->renderTemplate('template', $data);