From 05fbc3be7c507d195fb7728445cce2cdcec73938 Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Tue, 5 Aug 2025 17:19:53 +0800 Subject: [PATCH] update --- .../com/ffii/fpsms/m18/service/M18MasterDataService.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/m18/service/M18MasterDataService.kt b/src/main/java/com/ffii/fpsms/m18/service/M18MasterDataService.kt index b51be26..72b96f2 100644 --- a/src/main/java/com/ffii/fpsms/m18/service/M18MasterDataService.kt +++ b/src/main/java/com/ffii/fpsms/m18/service/M18MasterDataService.kt @@ -365,7 +365,7 @@ open class M18MasterDataService( val saveShopRequest = SaveShopRequest( id = null, code = ven.code, - name = ven.`desc_zh-TW`.ifEmpty { ven.desc }, + name = ven.`desc_zh-TW`.ifEmpty { ven.`desc_zh-CN`.ifEmpty { ven.desc } }, brNo = null, contactNo = ven.tel, contactEmail = ven.email, @@ -382,7 +382,7 @@ open class M18MasterDataService( shopService.saveShop(saveShopRequest) successList.add(vendor.id) - logger.info("Success Count ${successList.size}: ${vendor.id} | ${ven.code} | ${ven.desc}") + logger.info("Success Count ${successList.size}: ${vendor.id} | ${ven.code} | ${ven.`desc_zh-TW`.ifEmpty { ven.`desc_zh-CN`.ifEmpty { ven.desc } }}") } else { failList.add(vendor.id) logger.error("Fail Message: ${vendorDetail?.messages?.get(0)?.msgDetail}") @@ -710,7 +710,7 @@ open class M18MasterDataService( val saveShopRequest = SaveShopRequest( id = null, code = virdept.code, - name = virdept.`desc_zh-TW`.ifEmpty { virdept.desc }, + name = virdept.`desc_zh-TW`.ifEmpty { virdept.`desc_zh-CN`.ifEmpty { virdept.desc } }, brNo = null, contactNo = virdept.tel, contactEmail = virdept.email, @@ -727,7 +727,7 @@ open class M18MasterDataService( shopService.saveShop(saveShopRequest) successList.add(businessUnit.id) - logger.info("Success Count ${successList.size}: ${businessUnit.id} | ${virdept.code} | ${virdept.desc}") + logger.info("Success Count ${successList.size}: ${businessUnit.id} | ${virdept.code} | ${virdept.`desc_zh-TW`.ifEmpty { virdept.`desc_zh-CN`.ifEmpty { virdept.desc } }}") } else { failList.add(businessUnit.id) logger.error("(Business Unit) Fail Message: ${buMessages?.msgDetail}")