From 759f2b6b95e5d9f177ee193424f332dc9d553ca1 Mon Sep 17 00:00:00 2001 From: masayuki horiguchi Date: Wed, 29 Jan 2025 17:59:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E9=80=81?= =?UTF-8?q?=E4=BF=A1=E5=AF=BE=E8=B1=A1=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=88?= =?UTF-8?q?=E4=BC=9A=E5=93=A1=E4=BB=BB=E6=84=8F=E8=BF=BD=E5=8A=A0=E9=A0=85?= =?UTF-8?q?=E7=9B=AE=E3=83=A1=E3=83=BC=E3=83=AB=E5=9E=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 会員任意追加項目のメール型の場合での送付先を追加 --- app/Models/Common/BucketsMail.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/Models/Common/BucketsMail.php b/app/Models/Common/BucketsMail.php index 8f946a4f9..97fd99ec1 100644 --- a/app/Models/Common/BucketsMail.php +++ b/app/Models/Common/BucketsMail.php @@ -209,6 +209,27 @@ public static function getEmailGroups(?string $notice_groups) : array ->whereIn('group_users.group_id', $groups_ids) ->pluck('users.email') ->toArray(); + + // 追加会員項目のメールアドレス取得 + $group_user_userinputcols_emails = GroupUser::select('users_input_cols.value') + ->join('users', function ($users_join) { + $users_join->on('users.id', '=', 'group_users.user_id') + ->where('users.status', UserStatus::active); + }) + ->join('users_input_cols', function ($users_input_join) { + $users_input_join->on('users.id', '=', 'users_input_cols.users_id') + ->join('users_columns', function ($users_columns_join) { + $users_columns_join->on('users_columns.id', '=', 'users_input_cols.users_columns_id') + ->where('users_columns.column_type', 'mail'); + }); + }) + ->whereNotNull('users_input_cols.value') + ->whereIn('group_users.group_id', $groups_ids) + ->pluck('users_input_cols.value') + ->toArray(); + + //追加項目データをマージ + $group_user_emails = array_merge($group_user_emails, $group_user_userinputcols_emails); } // array_filter()でarrayの空要素削除 From 803a69eda74fd78fc30a3505dc87b4893fc684ec Mon Sep 17 00:00:00 2001 From: masayuki horiguchi Date: Wed, 29 Jan 2025 18:07:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Code=20Sniffer=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Code Sniffer対応 --- app/Models/Common/BucketsMail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Common/BucketsMail.php b/app/Models/Common/BucketsMail.php index 97fd99ec1..db3e81f4f 100644 --- a/app/Models/Common/BucketsMail.php +++ b/app/Models/Common/BucketsMail.php @@ -219,7 +219,7 @@ public static function getEmailGroups(?string $notice_groups) : array ->join('users_input_cols', function ($users_input_join) { $users_input_join->on('users.id', '=', 'users_input_cols.users_id') ->join('users_columns', function ($users_columns_join) { - $users_columns_join->on('users_columns.id', '=', 'users_input_cols.users_columns_id') + $users_columns_join->on('users_columns.id', '=', 'users_input_cols.users_columns_id') ->where('users_columns.column_type', 'mail'); }); })