|
|
@@ -131,12 +131,14 @@ const DisabilityPersonManagement: React.FC = () => {
|
|
|
canDownload: photo.canDownload
|
|
|
})),
|
|
|
bankCards: createBankCards
|
|
|
- .filter(card => card.fileId !== null && card.bankName && card.subBankName && card.cardNumber && card.cardholderName)
|
|
|
+ .filter(card => card.fileId !== null && card.bankNameId && card.subBankName && card.cardNumber && card.cardholderName)
|
|
|
.map(card => ({
|
|
|
subBankName: card.subBankName,
|
|
|
- bankName: card.bankName,
|
|
|
+ bankNameId: card.bankNameId!,
|
|
|
+ bankName: { id: card.bankNameId!, name: card.bankName || '', code: '', remark: null, createdAt: new Date(), updatedAt: new Date(), createdBy: null, updatedBy: null, status: 1 },
|
|
|
cardNumber: card.cardNumber,
|
|
|
cardholderName: card.cardholderName,
|
|
|
+ cardType: card.cardType || null,
|
|
|
fileId: card.fileId!,
|
|
|
isDefault: card.isDefault
|
|
|
})),
|
|
|
@@ -227,12 +229,14 @@ const DisabilityPersonManagement: React.FC = () => {
|
|
|
canDownload: photo.canDownload
|
|
|
})),
|
|
|
bankCards: updateBankCards
|
|
|
- .filter(card => card.fileId !== null && card.bankName && card.subBankName && card.cardNumber && card.cardholderName)
|
|
|
+ .filter(card => card.fileId !== null && card.bankNameId && card.subBankName && card.cardNumber && card.cardholderName)
|
|
|
.map(card => ({
|
|
|
subBankName: card.subBankName,
|
|
|
- bankName: card.bankName,
|
|
|
+ bankNameId: card.bankNameId!,
|
|
|
+ bankName: { id: card.bankNameId!, name: card.bankName || '', code: '', remark: null, createdAt: new Date(), updatedAt: new Date(), createdBy: null, updatedBy: null, status: 1 },
|
|
|
cardNumber: card.cardNumber,
|
|
|
cardholderName: card.cardholderName,
|
|
|
+ cardType: card.cardType || null,
|
|
|
fileId: card.fileId!,
|
|
|
isDefault: card.isDefault
|
|
|
})),
|
|
|
@@ -351,9 +355,11 @@ const DisabilityPersonManagement: React.FC = () => {
|
|
|
if (aggregatedData && aggregatedData.bankCards) {
|
|
|
const bankCards: BankCardItem[] = aggregatedData.bankCards.map((card: any) => ({
|
|
|
subBankName: card.subBankName,
|
|
|
- bankName: card.bankName,
|
|
|
+ bankNameId: card.bankNameId,
|
|
|
+ bankName: card.bankName?.name || '',
|
|
|
cardNumber: card.cardNumber,
|
|
|
cardholderName: card.cardholderName,
|
|
|
+ cardType: card.cardType || null,
|
|
|
fileId: card.fileId,
|
|
|
isDefault: card.isDefault,
|
|
|
tempId: `existing-bankcard-${card.id || Date.now()}`
|