From 0edd035b7f88c1d2c7a211c96b7c982f1621ebc4 Mon Sep 17 00:00:00 2001 From: Forus0322 Date: Wed, 4 Dec 2024 17:52:57 +0800 Subject: [PATCH 1/2] [Improve] The start time may be null.#4140 --- .../org/apache/streampark/console/core/bean/AlertTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertTemplate.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertTemplate.java index 697dc15261..ff6ebc6a1b 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertTemplate.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertTemplate.java @@ -79,7 +79,7 @@ public AlertTemplateBuilder endTime(Date endTime) { public AlertTemplateBuilder duration(Date start, Date end) { long duration; - if (start == null && end == null) { + if (start == null) { duration = 0L; } else if (end == null) { duration = System.currentTimeMillis() - start.getTime(); From 1d94b75271fdd241927d6b21a79d45126dbe18bc Mon Sep 17 00:00:00 2001 From: Forus0322 Date: Thu, 5 Dec 2024 16:40:25 +0800 Subject: [PATCH 2/2] [Bug]The new user configuration and the new team cannot log in properly. --- .../console/system/service/impl/UserServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java index 7f484f916f..dc2095ee63 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java @@ -33,6 +33,7 @@ import org.apache.streampark.console.system.authentication.JWTUtil; import org.apache.streampark.console.system.entity.Member; import org.apache.streampark.console.system.entity.Role; +import org.apache.streampark.console.system.entity.Team; import org.apache.streampark.console.system.entity.User; import org.apache.streampark.console.system.mapper.UserMapper; import org.apache.streampark.console.system.service.MemberService; @@ -287,6 +288,13 @@ public Map generateFrontendUserInfo(User user, JWTToken token) { user.dataMasking(); userInfo.put("user", user); + if (user.getLastTeamId() == null) { + List teams = this.teamService.listByUserId(user.getUserId()); + if (!teams.isEmpty()) { + user.setLastTeamId(teams.get(0).getId()); + } + } + // 3) permissions Set permissions = this.listPermissions(user.getUserId(), user.getLastTeamId()); userInfo.put("permissions", permissions);