From b2ea4ec71fc24ed7e7dc8e018c7726e8d0b30fb5 Mon Sep 17 00:00:00 2001 From: mayue Date: Wed, 27 Oct 2021 14:39:57 +0800 Subject: [PATCH] *Fix a bug #15741. --- module/api/model.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/module/api/model.php b/module/api/model.php index 47c37c18ae..6ba82950aa 100644 --- a/module/api/model.php +++ b/module/api/model.php @@ -209,28 +209,29 @@ class apiModel extends model $now = helper::now(); $account = $this->app->user->account; $data = fixer::input('post') - ->remove('type') ->skipSpecial('params,response') ->add('editedBy', $account) ->add('editedDate', $now) + ->add('version', $oldApi->version) ->setDefault('product,module', 0) + ->remove('type') ->get(); + + $changes = common::createChanges($oldApi, $data); + if(!empty($changes)) $data->version = $oldApi->version + 1; - $data->id = $oldApi->id; - $data->version = $oldApi->version + 1; - $apiSpec = $this->getApiSpecByData($data); - - $this->dao->replace(TABLE_API_SPEC)->data($apiSpec)->exec(); - - unset($data->id); $this->dao->update(TABLE_API) ->data($data) ->autoCheck() ->batchCheck($this->config->api->edit->requiredFields, 'notempty') ->where('id')->eq($apiID) ->exec(); + + $data->id = $apiID; + $apiSpec = $this->getApiSpecByData($data); + $this->dao->replace(TABLE_API_SPEC)->data($apiSpec)->exec(); - return common::createChanges($oldApi, $data); + return $changes; } /**