diff --git a/module/setting/model.php b/module/setting/model.php index 73313ea160..cfc072c106 100644 --- a/module/setting/model.php +++ b/module/setting/model.php @@ -37,7 +37,7 @@ class settingModel extends model public function getItem($owner, $section, $key) { return $this->dao->select('`value`')->from(TABLE_CONFIG) - ->where('company')->eq($this->app->company->id) + ->where('company')->eq(0) ->andWhere('owner')->eq($owner) ->andWhere('section')->eq($section) ->andWhere('`key`')->eq($key) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 6457b581a1..d15a3d0f07 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -75,14 +75,14 @@ class upgradeModel extends model /* 更新PMS的版本设置。*/ public function updateVersion($version) { - $item->company = $this->app->company->id; + $item->company = 0; $item->owner = 'system'; $item->section = 'global'; $item->key = 'version'; $item->value = $version; $configID = $this->dao->select('id')->from(TABLE_CONFIG) - ->where('company')->eq($this->app->company->id) + ->where('company')->eq(0) ->andWhere('owner')->eq('system') ->andWhere('section')->eq('global') ->andWhere('`key`')->eq('version') diff --git a/module/upgrade/view/selectversion.html.php b/module/upgrade/view/selectversion.html.php index 2d652023dc..9d2be26170 100644 --- a/module/upgrade/view/selectversion.html.php +++ b/module/upgrade/view/selectversion.html.php @@ -28,7 +28,7 @@ upgrade->selectVersion;?> upgrade->fromVersion;?> - upgrade->fromVersions, $version) . $lang->upgrade->noteVersion;?> + upgrade->fromVersions, $version) . "{$lang->upgrade->noteVersion}";?> upgrade->toVersion;?>