合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3131

@@ -258,7 +258,11 @@ class ImageController extends Controller
      */
     public function onlyName($enName,$project_id){
         $imageModel = new ImageModel();
-        $info = $imageModel->read(['project_id' => $project_id, 'en_name' => $enName]);
+        if(empty($project_id)){
+            $info = $imageModel->read(['en_name' => $enName]);
+        }else{
+            $info = $imageModel->read(['project_id' => $project_id, 'en_name' => $enName]);
+        }
         if($info !== false){
             return true;
         }
@@ -778,7 +782,6 @@ class ImageController extends Controller
             }
             $info['domain'] = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';
         }
-
         $this->response('success',Code::SUCCESS,$info);
     }
 }