From fcc21286d3835373ccd2b314c176057c920da8db Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 31 Jan 2020 08:45:20 +0800 Subject: [PATCH] * adjust for doc file size. --- module/doc/model.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index e329e9b2e7..c0eee574e6 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -447,13 +447,20 @@ class docModel extends model $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'doc', false); if(!$docs) return array(); + $docContents = $this->dao->select('*')->from(TABLE_DOCCONTENT)->where('doc')->in(array_keys($docs))->orderBy('version,doc')->fetchAll('doc'); foreach($docs as $index => $doc) { $docs[$index]->fileSize = 0; if(isset($files[$index])) { - $fileSize = 0; - foreach($files[$index] as $file) $fileSize += $file->size; + $docContent = $docContents[$index]; + $fileSize = 0; + foreach($files[$index] as $file) + { + if(strpos(",{$docContent->files},", ",{$file->id},") === false) continue; + $fileSize += $file->size; + } + if($fileSize < 1024) { $fileSize .= 'B';