Merge pull request #12678 from SORMAS-Foundation/#9905-make_sync_work…

…_for_users_without_role #9905- make sync work for users without role
SORMAS-Foundation · Oct 23, 2023 · a776b1a · a776b1a
2 parents 4d67791 + 81010fa
commit a776b1a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/user/UserDtoHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/user/UserDtoHelper.java
@@ -93,7 +93,7 @@ protected void fillInnerFromDto(User target, UserDto source) {
 		target.setLastName(source.getLastName());
 		target.setUserEmail(source.getUserEmail());
 
-		if (source.getUserRoles().size() > 0) {
+		if (source.getUserRoles() != null && source.getUserRoles().size() > 0) {
 			Set<UserRole> userRoles = Optional.of(target).map(User::getUserRoles).orElseGet(HashSet::new);
 			target.setUserRoles(userRoles);
 			userRoles.clear();
@@ -116,7 +116,7 @@ protected void fillInnerFromDto(User target, UserDto source) {
 		target.setPhone(source.getPhone());
 		target.setLanguage(source.getLanguage());
 
-		target.setJurisdictionLevel(DatabaseHelper.getUserDao().getJurisdictionLevel(target.getUserRoles()));
+		target.setJurisdictionLevel(source.getJurisdictionLevel());
 	}
 
 	@Override