compare entities by id

jaroldwong · jaroldwong · commit d656c5da80ba · 2024-03-13T14:52:44.000-07:00
diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserRoleService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserRoleService.java
@@ -71,7 +71,7 @@ public List<UserRole> findByLoginIdAndWorkgroup(String loginId, Workgroup workgr
 
 		List<UserRole> workgroupUserRoles = new ArrayList<UserRole>();
 		for( UserRole userRole : user.getUserRoles() ) {
-			if ( userRole.getWorkgroup() != null && userRole.getWorkgroup().equals(workgroup) ) {
+			if ( userRole.getWorkgroup() != null && userRole.getWorkgroup().getId() == workgroup.getId() ) {
 				workgroupUserRoles.add(userRole);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public List<UserRole> findByLoginIdAndWorkgroup(String loginId, Workgroup workgr`
`71`	`71`
`72`	`72`	`List<UserRole> workgroupUserRoles = new ArrayList<UserRole>();`
`73`	`73`	`for( UserRole userRole : user.getUserRoles() ) {`
`74`		`- if ( userRole.getWorkgroup() != null && userRole.getWorkgroup().equals(workgroup) ) {`
	`74`	`+ if ( userRole.getWorkgroup() != null && userRole.getWorkgroup().getId() == workgroup.getId() ) {`
`75`	`75`	`workgroupUserRoles.add(userRole);`
`76`	`76`	`}`
`77`	`77`	`}`