From 6e6c96ece36c943eb3ee6d9b6f2a143fe780956b Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Thu, 12 Mar 2026 15:31:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[=E3=83=A6=E3=83=BC=E3=82=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E7=8A=B6?= =?UTF-8?q?=E6=85=8B=E3=81=AE=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=82=92?= =?UTF-8?q?=E5=88=A9=E7=94=A8=E4=B8=8D=E5=8F=AF=E3=83=BB=E4=BB=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=AB=E5=A4=89=E3=81=88=E3=81=9F=E3=82=89=E3=80=81?= =?UTF-8?q?=E5=BC=B7=E5=88=B6=E3=83=AD=E3=82=B0=E3=82=A2=E3=82=A6=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Plugins/Manage/UserManage/UserManage.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Plugins/Manage/UserManage/UserManage.php b/app/Plugins/Manage/UserManage/UserManage.php index b8ef0db1f..bbc11bafa 100644 --- a/app/Plugins/Manage/UserManage/UserManage.php +++ b/app/Plugins/Manage/UserManage/UserManage.php @@ -964,6 +964,11 @@ public function update($request, $id = null) $update_array['password'] = Hash::make($request->password); } + // 状態が利用不可や仮削除の場合は強制ログアウトする。 + if ($request->status == UserStatus::not_active || $request->status == UserStatus::temporary_delete) { + $update_array['is_force_logout'] = 1; + } + // ユーザデータの更新 User::where('id', $id)->update($update_array); // 更新後を再取得 From 876a7c9810147c74b58c1797cfd5ff687527f431 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Sun, 5 Apr 2026 17:42:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?change:=20[=E3=83=A6=E3=83=BC=E3=82=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86]=20=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E7=8A=B6=E6=85=8B=E3=81=AE=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=82=92=E5=88=A9=E7=94=A8=E4=B8=8D=E5=8F=AF=E3=83=BB=E4=BB=AE?= =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=AB=E5=A4=89=E3=81=88=E3=81=9F=E3=82=89?= =?UTF-8?q?=E3=80=81=E5=BC=B7=E5=88=B6=E3=83=AD=E3=82=B0=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88=E5=87=A6=E7=90=86=E3=81=AE=E8=A6=8B=E7=9B=B4=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Plugins/Manage/UserManage/UserManage.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Plugins/Manage/UserManage/UserManage.php b/app/Plugins/Manage/UserManage/UserManage.php index bbc11bafa..0703e8486 100644 --- a/app/Plugins/Manage/UserManage/UserManage.php +++ b/app/Plugins/Manage/UserManage/UserManage.php @@ -965,8 +965,10 @@ public function update($request, $id = null) } // 状態が利用不可や仮削除の場合は強制ログアウトする。 - if ($request->status == UserStatus::not_active || $request->status == UserStatus::temporary_delete) { + if ((int)$request->status === UserStatus::not_active || (int)$request->status === UserStatus::temporary_delete) { $update_array['is_force_logout'] = 1; + } else { + $update_array['is_force_logout'] = 0; } // ユーザデータの更新