Merge branch 'develop' into feature/JDK11
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -332,17 +332,23 @@ public class SystemService {
|
||||
}
|
||||
|
||||
for (String profile : profiles) {
|
||||
UserDTO foundUserTmp = null;
|
||||
|
||||
String dbName = settingsModel.getDbNameFromProfileDb(profile);
|
||||
|
||||
//MD5 utilizzato da Ordikids e Farmmes
|
||||
if (UtilityString.isNullOrEmpty(password) && !UtilityString.isNullOrEmpty(md5User)) {
|
||||
foundUser = userCacheService.retrieveUser(dbName, md5User);
|
||||
foundUserTmp = userCacheService.retrieveUser(dbName, md5User);
|
||||
} else
|
||||
foundUser = userCacheService.retrieveUser(dbName, username, password, requestDataDTO.getApplication());
|
||||
foundUserTmp = userCacheService.retrieveUser(dbName, username, password, requestDataDTO.getApplication());
|
||||
|
||||
if (foundUser == null || !foundUser.isAttivo())
|
||||
if (foundUserTmp == null || !foundUserTmp.isAttivo())
|
||||
continue;
|
||||
|
||||
if (foundUser == null) {
|
||||
foundUser = foundUserTmp;
|
||||
}
|
||||
|
||||
if (!foundUser.getAvailableProfiles().contains(profile)) {
|
||||
foundUser.getAvailableProfiles().add(profile);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user