From 7d200d9a7398544a2738091f0fcc5c5907519d80 Mon Sep 17 00:00:00 2001
From: ganzizi <zhicheng123@126.com>
Date: Wed, 24 May 2023 10:10:56 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=85=A8=E5=B1=80=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/WorkflowController.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php
index b569709d6..dc242c3d8 100755
--- a/app/Http/Controllers/Api/WorkflowController.php
+++ b/app/Http/Controllers/Api/WorkflowController.php
@@ -178,7 +178,6 @@ class WorkflowController extends AbstractController
      *
      * @apiQuery {Number} proc_inst_id        流程实例ID
      * @apiQuery {String} content             评论内容
-     * @apiQuery {Array} [images]             评论图片（格式：[{"images":"xxx"}]）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -189,8 +188,7 @@ class WorkflowController extends AbstractController
         $user = User::auth();
         $data['proc_inst_id'] = intval(Request::input('proc_inst_id'));
         $data['userid'] = (string)$user->userid;
-        $data['content'] = Request::input('content');
-        $data['images'] = Request::input('images');
+        $data['content'] = Request::input('content'); //内容+图片
 
         $ret = Ihttp::ihttp_post($this->flow_url.'/api/v1/workflow/process/addGlobalComment', json_encode(Base::arrayKeyToCamel($data)));
         $process = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true);
@@ -1027,6 +1025,18 @@ class WorkflowController extends AbstractController
                 $val['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : '';
             }
         }
+        // 全局评论
+        if(isset($res['global_comment_obj'])){
+            info(111111);
+            foreach ($res['global_comment_obj'] as $k => &$globalComment) {
+                $info = User::whereUserid($globalComment['user_id'])->first();
+                if (!$info) {
+                    continue;
+                }
+                $res['global_comment_obj'][$k]['userimg'] = User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname);
+                $res['global_comment_obj'][$k]['nickname'] = $info->nickname;
+            }
+        }
         $info = User::whereUserid($res['start_user_id'])->first();
         $res['userimg'] = $info ? User::getAvatar($info->userid, $info->userimg, $info->email, $info->nickname) : '';
         return $res;