From 363a0145d9f43e30bc12c072c80c76d147ff0e7e Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Wed, 18 Mar 2026 21:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=89=80=E6=9C=89=E4=BA=BA?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=97=B6=E9=95=BF=EF=BC=9A=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=20user=5Fposition=5Fid=20=E4=B8=BA=E7=A9=BA=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E8=81=8C=E5=8A=A1=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/AutoSaveExp.php          |  6 ++--
 app/Http/Controllers/ChatController.php       |  7 ++---
 ...d_nullable_on_position_duty_logs_table.php | 28 +++++++++++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 database/migrations/2026_03_18_214320_make_user_position_id_nullable_on_position_duty_logs_table.php

diff --git a/app/Console/Commands/AutoSaveExp.php b/app/Console/Commands/AutoSaveExp.php
index fca5cc9..9a4f401 100644
--- a/app/Console/Commands/AutoSaveExp.php
+++ b/app/Console/Commands/AutoSaveExp.php
@@ -278,10 +278,8 @@ class AutoSaveExp extends Command
      */
     private function tickDutyLog(User $user, int $roomId): void
     {
+        // 无论有无职务，均记录在线流水
         $activeUP = $user->activePosition;
-        if (! $activeUP) {
-            return;
-        }
 
         // ① 今日未关闭的开放日志 → 刷新时长
         $openLog = PositionDutyLog::query()
@@ -315,7 +313,7 @@ class AutoSaveExp extends Command
 
         PositionDutyLog::create([
             'user_id' => $user->id,
-            'user_position_id' => $activeUP->id,
+            'user_position_id' => $activeUP?->id,
             'login_at' => $loginAt,
             'ip_address' => '0.0.0.0',
             'room_id' => $roomId,
diff --git a/app/Http/Controllers/ChatController.php b/app/Http/Controllers/ChatController.php
index 3f5c84d..bda0f2b 100644
--- a/app/Http/Controllers/ChatController.php
+++ b/app/Http/Controllers/ChatController.php
@@ -1049,11 +1049,8 @@ class ChatController extends Controller
      */
     private function tickDutyLog(User $user, int $roomId): void
     {
-        // 无在职职务，无需记录
+        // 无论有无职务，均记录在线流水
         $activeUP = $user->activePosition;
-        if (! $activeUP) {
-            return;
-        }
 
         // ① 优先找今日未关闭的开放日志，直接刷新时长
         $openLog = PositionDutyLog::query()
@@ -1091,7 +1088,7 @@ class ChatController extends Controller
 
         PositionDutyLog::create([
             'user_id' => $user->id,
-            'user_position_id' => $activeUP->id,
+            'user_position_id' => $activeUP?->id,
             'login_at' => $loginAt,
             'ip_address' => request()->ip(),
             'room_id' => $roomId,
diff --git a/database/migrations/2026_03_18_214320_make_user_position_id_nullable_on_position_duty_logs_table.php b/database/migrations/2026_03_18_214320_make_user_position_id_nullable_on_position_duty_logs_table.php
new file mode 100644
index 0000000..7b0636a
--- /dev/null
+++ b/database/migrations/2026_03_18_214320_make_user_position_id_nullable_on_position_duty_logs_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('position_duty_logs', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_position_id')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('position_duty_logs', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_position_id')->nullable(false)->change();
+        });
+    }
+};