From 732a6d88916738c4233045f2e11bd873be4f7203 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Fri, 4 Mar 2022 08:46:41 +0800
Subject: [PATCH] * Fix bug: declare function of ext model.

---
 framework/base/router.class.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index 5bbc30d295..ac239ef733 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -1660,13 +1660,9 @@ class baseRouter
         $modelLines .= "class $tmpModelClass extends $modelClass \n{\n";
 
         /* 将扩展文件的代码合并到代码中。Cycle all the extension files and merge them into model lines. */
-        $fileNames = array();
-        foreach($extFiles as $extFile)
-        {
-            $fileName = basename($extFile);
-            if(!in_array($fileName, $fileNames)) $modelLines .= self::removePHPTAG($extFile);
-            $fileNames[] = $fileName;
-        }
+        $extModels = array();
+        foreach($extFiles  as $extFile)  $extModels[basename($extFile)] = $extFile;
+        foreach($extModels as $extModel) $modelLines .= self::removePHPTAG($extModel);
 
         /* 做个标记，方便后面替换代码使用。Make a mark for replacing codes. */
         $replaceMark = '//**//';