Resolved Conflicts
This commit is contained in:
@@ -100,8 +100,8 @@ public class ApplicationEvaluationDao {
|
||||
if (assignedApplicationsList.isEmpty()) {
|
||||
response.setAssignedApplicationId(null);
|
||||
} else {
|
||||
AssignedApplicationsEntity assignedApplications = assignedApplicationsList.get(0);
|
||||
response.setAssignedApplicationId(assignedApplications.getId());
|
||||
// AssignedApplicationsEntity assignedApplications = assignedApplicationsList.get(0);
|
||||
response.setAssignedApplicationId(entity.getAssignedApplicationsEntity().getId());
|
||||
}
|
||||
|
||||
response.setNote(entity.getNote());
|
||||
|
||||
Reference in New Issue
Block a user