From 693fa4668861528cf37de51f678eb8348b1c43e6 Mon Sep 17 00:00:00 2001
From: weifs <605403358@qq.com>
Date: Thu, 25 Apr 2024 11:24:30 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=AE=A1=E6=89=B9=E5=92=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ApproveController.php    |  2 +-
 app/Models/ProjectTask.php                        |  6 ++++--
 resources/assets/sass/dark.scss                   | 15 +++++++++++++++
 .../sass/pages/components/dialog-wrapper.scss     | 11 +++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php
index 50d1a4c46..ae80dfd61 100755
--- a/app/Http/Controllers/Api/ApproveController.php
+++ b/app/Http/Controllers/Api/ApproveController.php
@@ -1000,7 +1000,7 @@ class ApproveController extends AbstractController
         }
         //
         try {
-            $msg = WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text, 'approve_type' => $type], $botUser->userid, false, false, true);
+            $msg = WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text, 'approve_type' => $type], $process['start_user_id'], false, false, true);
             // 关联信息
             if ($action == 'start') {
                 $proc_msg = new ApproveProcMsg();
diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index 1f9aeba25..fa4e2b869 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -1667,7 +1667,9 @@ class ProjectTask extends AbstractModel
         if (empty($receivers)) {
             return;
         }
-
+        //
+        $userid = User::userid();
+        //
         $botUser = User::botGetOrCreate('task-alert');
         if (empty($botUser)) {
             return;
@@ -1699,7 +1701,7 @@ class ProjectTask extends AbstractModel
                 ProjectTaskPushLog::createInstance($data)->save();
                 WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', [
                     'text' => str_replace("您的任务", $replace, $text) . $suffix
-                ], $botUser->userid);
+                ], in_array($type, [0, 3]) ? $userid : $botUser->userid);
             }
         }
     }
diff --git a/resources/assets/sass/dark.scss b/resources/assets/sass/dark.scss
index 9b658e0a6..13c9e9be7 100644
--- a/resources/assets/sass/dark.scss
+++ b/resources/assets/sass/dark.scss
@@ -261,6 +261,21 @@ body.dark-mode-reverse {
                                         }
                                     }
                                 }
+
+                                .open-approve-details {
+                                    .ivu-btn-primary {
+                                        background-color: #d34521;
+                                        border-color: #d34521;
+                                    }
+                                    .ivu-btn-grey {
+                                        background-color: #9e9e9e;
+                                        border-color: #969696;
+                                        &:hover {
+                                            background-color: #959595;
+                                            border-color: #959595;
+                                        }
+                                    }
+                                }
                             }
 
                             .dialog-emoji {
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 4e4529719..27047a685 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -1474,6 +1474,17 @@
                 }
             }
 
+            &.self {
+                .dialog-view{
+                    .open-approve-details {
+                        .ivu-btn-grey {
+                            background-color: #efefef;
+                            border-color: #f3f3f3;
+                        }
+                    }
+                }
+            }
+
             .dialog-action {
                 align-self: flex-start;
                 display: flex;