Resolved Conflicts

This commit is contained in:
harish
2024-10-28 17:31:49 +05:30
4 changed files with 24 additions and 31 deletions

View File

@@ -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());