Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good

This commit is contained in:
2025-02-13 15:09:22 +01:00

View File

@@ -365,7 +365,9 @@ public class SystemService {
String dbName = settingsModel.getDbNameFromProfileDb(profile); String dbName = settingsModel.getDbNameFromProfileDb(profile);
UserDTO foundUser = userCacheService.retrieveUser(dbName, username, password, requestDataDTO.getApplication()); UserDTO foundUser = userCacheService.retrieveUser(dbName, username, password, requestDataDTO.getApplication());
if (foundUser.isAttivo()) { if (foundUser == null || !foundUser.isAttivo())
continue;
String sql = Query.format("SELECT * FROM " + StbUser.ENTITY + " WHERE user_name = {}", username); String sql = Query.format("SELECT * FROM " + StbUser.ENTITY + " WHERE user_name = {}", username);
StbUser stbUser; StbUser stbUser;
try (MultiDBTransactionManager mdb = new MultiDBTransactionManager(profile)) { try (MultiDBTransactionManager mdb = new MultiDBTransactionManager(profile)) {
@@ -389,7 +391,6 @@ public class SystemService {
put("key_group", foundUser.getKeyGroup()); put("key_group", foundUser.getKeyGroup());
}}; }};
}
} }