From 741997f967a50b81e6f8a2baf897c300152d13d7 Mon Sep 17 00:00:00 2001
From: harish <harish.bagora1@gmail.com>
Date: Wed, 30 Oct 2024 12:19:28 +0530
Subject: [PATCH] Updated code

---
 .../repositories/AssignedApplicationsRepository.java      | 8 +++-----
 .../service/impl/ApplicationEvaluationServiceImpl.java    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java
index beeb4610..164dcb0a 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java
@@ -15,12 +15,10 @@ public interface AssignedApplicationsRepository extends JpaRepository<AssignedAp
     Optional<AssignedApplicationsEntity> findByIdAndIsDeletedFalse(Long id);
     @Query("SELECT aa FROM AssignedApplicationsEntity aa WHERE aa.isDeleted = false " +
             "AND (:applicationId IS NULL OR aa.application.id = :applicationId) " +
-            "AND (:id IS NULL OR aa.id = :id) " +
-            "AND (:userId IS NULL OR aa.userId = :userId)")
-    Optional<AssignedApplicationsEntity> findByApplicationIdOrIdAndUserIdAndIsDeletedFalse(
+            "AND (:id IS NULL OR aa.id = :id) ")
+    Optional<AssignedApplicationsEntity> findByApplicationIdOrIdAndIsDeletedFalse(
             @Param("applicationId") Long applicationId,
-            @Param("id") Long id,
-            @Param("userId") Long userId);
+            @Param("id") Long id);
 
 
 
diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
index 8550b63f..6ccee608 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
@@ -65,7 +65,7 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
         }
         UserEntity preInstructor = validator.validateUser(request);
         Optional<AssignedApplicationsEntity> assignedApplicationsOptional =
-                assignedApplicationsRepository.findByApplicationIdOrIdAndUserIdAndIsDeletedFalse(applicationId,assignedApplicationId, preInstructor.getId());
+                assignedApplicationsRepository.findByApplicationIdOrIdAndIsDeletedFalse(applicationId,assignedApplicationId);
 
         if (assignedApplicationId != null) {
             assignedApplicationsOptional = assignedApplicationsOptional.filter(a -> a.getId().equals(assignedApplicationId));