From 1e7725c722e63249dd549b046b8d71aec301dd25 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Mon, 9 Dec 2019 11:42:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9B=A0=E5=9B=BE=E7=89=87=E4=B8=8D=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/modules/goods/models/searchs/GoodsSearch.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/modules/goods/models/searchs/GoodsSearch.php b/backend/modules/goods/models/searchs/GoodsSearch.php
index 6a8b04f..f70194c 100755
--- a/backend/modules/goods/models/searchs/GoodsSearch.php
+++ b/backend/modules/goods/models/searchs/GoodsSearch.php
@@ -63,7 +63,7 @@ class GoodsSearch extends Goods
'width'=>'10%',
'format' => 'raw',
'value' => function ($model) {
- return $model->image ?
+ return $model->imageFile ?
Html::img(['/'.$model->imageFile->path], ['style' => 'width:80px'])
: '
未设置
';
From 6de26a78955a943226a39a94f94146894d68434c Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Mon, 9 Dec 2019 11:43:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9B=A0=E5=9B=BE=E7=89=87=E4=B8=8D=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/modules/goods/views/goods/view.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/modules/goods/views/goods/view.php b/backend/modules/goods/views/goods/view.php
index 89146a0..d553ca5 100755
--- a/backend/modules/goods/views/goods/view.php
+++ b/backend/modules/goods/views/goods/view.php
@@ -77,7 +77,7 @@ $this->params['breadcrumbs'][] = $this->title;
['attribute' => 'image',
'format' => 'raw',
'value' => function ($model) {
- return $model->image ?
+ return $model->imageFile ?
Html::img(['/'.$model->imageFile->path], ['style' => 'width:80px'])
: '未设置
';
From 367579eca60d328d134fedda9f8680849ed4a7b7 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Mon, 9 Dec 2019 14:16:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/modules/file/logic/file/FileManager.php | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/backend/modules/file/logic/file/FileManager.php b/backend/modules/file/logic/file/FileManager.php
index 35edc15..a5b13ec 100755
--- a/backend/modules/file/logic/file/FileManager.php
+++ b/backend/modules/file/logic/file/FileManager.php
@@ -61,13 +61,11 @@ class FileManager
foreach ($temFileIdArr as $key => $value) {
$temFile = TemFile::findOne($value);
- if (!$temFile) {
- throw new \Exception('存在查找不到的文件');
- }
-
- $res = self::saveNewFile($temFile, $ownId, $ownType);
- if ($key == 0) {
- $firstFileId = $res['file_id'];
+ if ($temFile) {
+ $res = self::saveNewFile($temFile, $ownId, $ownType);
+ if ($key == 0) {
+ $firstFileId = $res['file_id'];
+ }
}
}