From 14cce37a73c17683517414687bf76be18b7ee819 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 24 二月 2022 12:25:16 +0800
Subject: [PATCH] [update] 若加入顧問清單時未帶入createdTime,則帶入目前時間

---
 pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java |    4 +++-
 pamapi/src/doc/顧問API/將顧問加入客戶的清單.txt                                |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\260\207\351\241\247\345\225\217\345\212\240\345\205\245\345\256\242\346\210\266\347\232\204\346\270\205\345\226\256.txt" "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\260\207\351\241\247\345\225\217\345\212\240\345\205\245\345\256\242\346\210\266\347\232\204\346\270\205\345\226\256.txt"
index 764ac45..13c32b7 100644
--- "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\260\207\351\241\247\345\225\217\345\212\240\345\205\245\345\256\242\346\210\266\347\232\204\346\270\205\345\226\256.txt"
+++ "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\260\207\351\241\247\345\225\217\345\212\240\345\205\245\345\256\242\346\210\266\347\232\204\346\270\205\345\226\256.txt"
@@ -5,7 +5,7 @@
     "consultantList": [
         {
             "agentNo": "Z152717443",
-            "createdTime": "2020-05-18T03:24:40Z"
+            "createdTime": "2020-05-18T03:24:40Z"   // ��null����垢���葆����
         },
         {
             "agentNo": "AGAM11249699",
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
index 30c4f53..fadb2af 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -236,7 +236,9 @@
 
             if(!isConsultantInList) {
                 CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
-                customerFavoriteConsultant.setCreatedDate(addConsultantData.getCreatedTime());
+                Optional<Instant> createdTime = Optional.ofNullable(addConsultantData.getCreatedTime());
+
+                customerFavoriteConsultant.setCreatedDate(createdTime.orElse(Instant.now()));
                 customerFavoriteConsultant.setConsultant(consultant);
                 customerFavoriteConsultant.setCustomerId(userId);
 

--
Gitblit v1.8.0