Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into cyy_fixbug

This commit is contained in:
caoyanyi
2023-04-24 11:56:58 +08:00
3 changed files with 2 additions and 4 deletions
+1 -1
View File
@@ -945,7 +945,7 @@ CHANGE `extra` `extra` char(30) NOT NULL DEFAULT '';
ALTER TABLE `zt_release`
CHANGE `project` `project` varchar(255) NOT NULL DEFAULT '0',
CHANGE `leftBugs` `leftBugs` text NULL;
CHANGE `leftBugs` `leftBugs` text NULL,
CHANGE `notify` `notify` varchar(255) NOT NULL default '';
ALTER TABLE `zt_researchplan`
-2
View File
@@ -781,8 +781,6 @@ class apiModel extends model
$lib->baseUrl = $baseUrl;
$lib->acl = 'open';
$lib->users = ',' . $currentAccount . ',';
$lib->addedBy = $currentAccount;
$lib->addedDate = helper::now();
$this->dao->insert(TABLE_DOCLIB)->data($lib)->autoCheck()
->batchCheck($this->config->api->createlib->requiredFields, 'notempty')
->check('name', 'unique', "`type` = 'api'")
+1 -1
View File
@@ -181,7 +181,7 @@ class chart extends control
$sql = str_replace(';', '', "$post->sql");
$fields = $post->fieldSettings;
$langs = isset($post->langs) ? json_decode($post->langs, true) : array();
$langs = !empty($post->langs) ? $post->langs : array();
switch($type)
{