From ab3271d84f0dccf77df9139c7c609ce788f16a44 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Mon, 8 Sep 2025 15:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=B7=B2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E9=99=90=E5=88=B62?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/Upload.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/common/controller/Upload.php b/app/common/controller/Upload.php
index d30b7de..897e327 100644
--- a/app/common/controller/Upload.php
+++ b/app/common/controller/Upload.php
@@ -327,7 +327,7 @@ class Upload extends BaseController
             }
             $prefix='emoji/'.$uid.'/';
             $name=str_replace('.'.$info['ext'],'',$info['name']);
-            $fileInfo=FileModel::where(['md5'=>$info['md5'],'user_id'=>$uid])->find();
+            $fileInfo=FileModel::where(['md5'=>$info['md5'],'user_id'=>$uid,'delete_time'=>0])->find();
             // 判断文件是否存在，如果有则不再上传
             if(!$fileInfo){
                 $newName   = uniqid() . '.' . $info['ext'];
@@ -350,8 +350,7 @@ class Upload extends BaseController
                 $fileInfo=new FileModel;
                 $fileInfo->save($ret);
             }else{
-                //$object = $fileInfo->src;
-                return shutdown(lang('file.emojiExist'));
+                $object = $fileInfo->src;
             }
             // 把左边的/去掉再加上，避免有些有/有些没有
             $object='/'.ltrim($object,'/');
@@ -362,6 +361,10 @@ class Upload extends BaseController
                 "type"     => 2,
                 "file_id"  => $fileInfo->file_id,
             ];
+            $query = Emoji::where($emojiInfo)->find();
+            if ($query) {
+                return shutdown(lang('file.emojiExist'));
+            }
             Emoji::create($emojiInfo);
             return success('',$this->url.$object);
         } catch(\Exception $e) {