From a922dbf425c61eeb276720d2303d4c9e4292e80b Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期五, 26 十一月 2021 10:28:19 +0800
Subject: [PATCH] [ Update ] 修正 page-container min-height高度
---
pamapi/src/main/java/com/pollex/pam/security/SecurityUtils.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..5e6c77b 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,18 @@
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");
+ Map<String, String> userDetails = getCurrentUserDetails();
+ return Long.parseLong(userDetails.get(CustomerDetailEnum.ID.getValue()));
}
-
+
public static Map<String, String> getCurrentUserDetails() {
SecurityContext securityContext = SecurityContextHolder.getContext();
if(securityContext.getAuthentication()==null ||
--
Gitblit v1.8.0