From 33d0d51a799302ebc3ff47b86dbce4c1912abd22 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 10:10:43 +0800
Subject: [PATCH] [update] 【todo 131218】嚴選配對 與 快速篩選 的滿意度評分皆改成 列出指定滿意度評分以上的顧問

---
 pamapi/src/main/java/com/pollex/pam/security/SecurityUtils.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/security/SecurityUtils.java b/pamapi/src/main/java/com/pollex/pam/security/SecurityUtils.java
index ef4095a..787c1f3 100644
--- a/pamapi/src/main/java/com/pollex/pam/security/SecurityUtils.java
+++ b/pamapi/src/main/java/com/pollex/pam/security/SecurityUtils.java
@@ -5,6 +5,8 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import com.pollex.pam.enums.ConsultantDetailEnum;
+import com.pollex.pam.enums.CustomerDetailEnum;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
@@ -99,18 +101,17 @@
     private static Stream<String> getAuthorities(Authentication authentication) {
         return authentication.getAuthorities().stream().map(GrantedAuthority::getAuthority);
     }
-    
+
     public static String getAgentNo() {
-    	return getCurrentUserLogin().orElseGet(null);
+        Map<String, String> userDetails = getCurrentUserDetails();
+        return userDetails.get(ConsultantDetailEnum.AGENT_NO.getValue());
     }
-    
-    // todo , should get id from user details
-    public static Long getCustomerId() {
-//    	Map<String, String> userDetails = getCurrentUserDetails();
-//    	return Long.parseLong(userDetails.get("id"));
-    	return Long.parseLong("2");
+
+    public static Long getCustomerDBId() {
+    	Map<String, String> userDetails = getCurrentUserDetails();
+    	return Long.parseLong(userDetails.get(CustomerDetailEnum.DB_ID.getValue()));
     }
-    
+
     public static Map<String, String> getCurrentUserDetails() {
    	 SecurityContext securityContext = SecurityContextHolder.getContext();
    	 if(securityContext.getAuthentication()==null ||

--
Gitblit v1.8.0