From c8d6116f34cac94ba696034d70b42c0078cdab87 Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期四, 09 十二月 2021 15:31:43 +0800
Subject: [PATCH] [ Update ] : #Todo: 132092 && #Todo: 132135 safari and chrome 籃框問題修正 ， #Todo:132137 顧問所在地區 input 增加 readonly 不需打開鍵盤
---
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