Merge branch 'dev' of https://gitea.f2b211.com/jsasg/orico-official-website into dev

app/admin/controller/v1/Upload.php

@@ -222,7 +222,7 @@ class Upload
         $config_model = new \app\admin\controller\v1\SiteConfig;
         $config       = $config_model->getByGroupUniqueLabel('upload');
         $options      = data_get($config, $module, []);
-        throw_if(empty($options), '上传配置错误');
+        
         return [
             'filename_keep'  => (int)data_get($options, 'filename_keep.value', 0)  == 1,
             'filemd5_unique' => (int)data_get($options, 'filemd5_unique.value', 0) == 1,

app/index/controller/Common.php

@@ -106,6 +106,7 @@ abstract class Common extends BaseController
                 'language_id'  =>  $language,
                 'status'       => 1
             ])
+            ->where('status', '=', 1)
             ->order(['sort' => 'asc', 'id' => 'asc'])
             ->select();
         if ($nav->isEmpty()) {