nik/OMDSCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into ccb

Browse Source
This commit is contained in:
makabe 2024-03-14 09:10:06 +09:00
commit 017276c94a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data_migration_tools/server/src/features/transfer/transfer.service.ts
View File

@ -511,7 +511,7 @@ export class TransferService {
// accountsFileLinesの行ループ // accountsFileLinesの行ループ
accountsFileLines.forEach((account) => { accountsFileLines.forEach((account) => {
const duplicateAdminMail = newAccountsFileLines.find( const duplicateAdminMail = newAccountsFileLines.find(
(a) => a.adminMail === account.adminMail (a) => a.adminMail.toLowerCase() === account.adminMail.toLowerCase() // メールアドレスは大文字小文字を区別しない
); );
if (duplicateAdminMail) { if (duplicateAdminMail) {
@ -531,7 +531,7 @@ export class TransferService {
// usersFileLinesの行ループ // usersFileLinesの行ループ
usersFileLines.forEach((user) => { usersFileLines.forEach((user) => {
const duplicateUserEmail = newUsersFileLines.find( const duplicateUserEmail = newUsersFileLines.find(
(u) => u.email === user.email (u) => u.email.toLowerCase() === user.email.toLowerCase() // メールアドレスは大文字小文字を区別しない
); );
if (duplicateUserEmail) { if (duplicateUserEmail) {
@ -553,7 +553,7 @@ export class TransferService {
} }
// newAccountsFileLinesとの突合せ // newAccountsFileLinesとの突合せ
const duplicateAdminUserEmail = newAccountsFileLines.find( const duplicateAdminUserEmail = newAccountsFileLines.find(
(a) => a.adminMail === user.email (a) => a.adminMail.toLowerCase() === user.email.toLowerCase() // メールアドレスは大文字小文字を区別しない
); );
// 重複がある場合 // 重複がある場合
if (duplicateAdminUserEmail) { if (duplicateAdminUserEmail) {