Merge branch 'sprint/fix-api' into 'master'

* Fix loadModel for entry.

See merge request easycorp/zentaopms!5958

framework/api/entry.class.php

@@ -300,9 +300,6 @@ class baseEntry
              * 引入该模块的control文件。
              * Include the control file of the module.
              **/
-
-            $file2Included = $app->setActionExtFile() ? $app->extActionFile : $app->controlFile;
-
             $isExt = $app->setActionExtFile();
             if($isExt)
             {
@@ -342,7 +339,7 @@ class baseEntry
      */
     public function loadModel($moduleName = '', $appName = '')
     {
-        if(empty($moduleName)) $moduleName = $this->moduleName;
+        if(empty($moduleName)) $moduleName = $this->app->moduleName;
         if(empty($appName))    $appName    = $this->app->appName;
 
         global $loadedModels;

framework/base/router.class.php

@@ -1709,7 +1709,7 @@ class baseRouter
         /* 如果扩展目录为空，不包含任何扩展文件。If there's no ext paths return false.*/
         if(empty($moduleExtPaths)) return false;
 
-        if(!empty( $moduleExtPaths['saas']))
+        if(!empty($moduleExtPaths['saas']))
         {
             $this->extActionFile = $moduleExtPaths['saas'] . $this->methodName . '.php';
             if(file_exists($this->extActionFile)) return true;

module/task/control.php

@@ -1660,7 +1660,6 @@ class task extends control
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
 
         $this->display();
-
     }
 
     /**