diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 390cb953df717ac12b3887caaea4ec68ebdce061..eea33cd1c91ebdfff2bf8fa4ebf99d1bf41b0644 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -1295,6 +1295,7 @@ EOD; $iterator = new \FilesystemIterator($parentDir); $isDirEmpty = !$iterator->valid(); if ($isDirEmpty) { + unset($iterator); rmdir($parentDir); $parentDir = dirname($parentDir); } else { @@ -1587,7 +1588,7 @@ EOD; $inputType = 'datetime'; } // 指定后缀结尾且类型为enum,说明是个单选框 - if ($this->isMatchSuffix($fieldsName, $this->enumRadioSuffix) && $v['DATA_TYPE'] == 'enum') { + if ($this->isMatchSuffix($fieldsName, $this->enumRadioSuffix) && $v['DATA_TYPE'] == 'enum' || $v['DATA_TYPE'] == 'smallint') { $inputType = "radio"; } // 指定后缀结尾且类型为set,说明是个复选框