朋友圈发布的图片合并一张图2

app/enterprise/controller/Posts.php

@@ -106,7 +106,7 @@ class Posts extends BaseController
             ['delete_time', '=', 0]
         ];
 
-        $field = 'id,content,location,address,type,user_id,create_time,privacy';
+        $field = 'id,content,location,address,type,user_id,create_time,privacy,avatar';
         $order = 'create_time desc';
         $model = new PostsModel();
 
@@ -116,8 +116,21 @@ class Posts extends BaseController
             $data = $list->toArray()['data'];
             foreach ($data as &$item) {
 
-                $item['files'] = PostsFile::getPostsFile($item['id']);
+                $src = '';
+                if (empty($item['avatar'])) {
+                    $item['files'] = PostsFile::getPostsFile($item['id']);
+                    if (strpos($item['type'], '2') !== false && count($item['files']) > 1) {
+                        $imageFileArr = array_column($item['files'], 'src');
+                        $src = PostsModel::createPostsAvatar($item['id'], $imageFileArr);
+                    }
+                } else {
+                    $src = $item['avatar'];
+                }
+                if ($src) {
+                    $item['files'][] = ['file_id' => 0, 'type' => 1, 'src' => $src];
+                }
 
+                unset($data['avatar']);
             }
         }
         return success('', $data,$list->total(),$list->currentPage());
@@ -137,25 +150,13 @@ class Posts extends BaseController
             ['status', '=', 1],
             ['delete_time', '=', 0]
         ];
-        $field = 'id,content,location,address,type,user_id,create_time,privacy,avatar';
+        $field = 'id,content,location,address,type,user_id,create_time,privacy';
         $data = (new PostsModel())->where($where)->field($field)->find();
         if (!$data) {
             return warning(lang('system.error'));
         }
 
-        $src = '';
-        if (empty($data['avatar'])) {
-            $data['files'] = PostsFile::getPostsFile($data['id']);
-            if (strpos('2',$data['type']) !== false && count($data['files']) > 1) {
-                $imageFileArr = array_column($data['files'], 'src');
-                $src = PostsModel::createPostsAvatar($data['posts_id'], $imageFileArr);
-            }
-        } else {
-            $src = $data['avatar'];
-        }
-        if ($src) {
-            $data['files'][] = ['file_id' => 0, 'type' => 1, 'src' => $src];
-        }
+        $data['files'] = PostsFile::getPostsFile($data['id']);
 
         $friendIds = Friend::getFriendIds($this->uid);
         $friendIds[] = $this->uid;
@@ -168,8 +169,6 @@ class Posts extends BaseController
 
         $data['user'] = $this->getFriendUserInfo($data['user_id']);
 
-        unset($data['avatar']);
-
         return success('', $data);
     }