From 990a40e4e423034d41042d34aad5cddc96a0ce34 Mon Sep 17 00:00:00 2001
From: weifs <605403358@qq.com>
Date: Mon, 3 Jun 2024 15:14:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=A6=BB=E8=81=8C=E5=AF=B9okr=E7=9A=84=E7=A7=BB=E4=BA=A4?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/UserTransfer.php | 1 +
 docker-compose.yml          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Models/UserTransfer.php b/app/Models/UserTransfer.php
index ad6be62dd..cc659c40a 100644
--- a/app/Models/UserTransfer.php
+++ b/app/Models/UserTransfer.php
@@ -53,6 +53,7 @@ public function start()
         WebSocketDialog::select(['web_socket_dialogs.*'])
             ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
             ->where('web_socket_dialogs.type', 'group')
+            ->where('web_socket_dialogs.group_type', '!=', 'okr')
             ->where('u.userid', $this->original_userid)
             ->orderByDesc('web_socket_dialogs.id')
             ->chunk(100, function($list) {
diff --git a/docker-compose.yml b/docker-compose.yml
index 9abb7cbc9..8bdb933ef 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -177,7 +177,7 @@ services:
 
   okr:
     container_name: "dootask-okr-${APP_ID}"
-    image: "kuaifan/doookr:0.4.2"
+    image: "kuaifan/doookr:0.4.3"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       DOO_TASK_URL: "http://${APP_IPPR}.3"