From 23760300950fcda8f82fe5d0e96d348ef96d95b2 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Sat, 14 Dec 2024 12:40:40 +0530
Subject: [PATCH] updated code

---
 .../net/gepafin/tendermanagement/dao/ApplicationDao.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 8803d46d..0feafec8 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -455,16 +455,17 @@ public class ApplicationDao {
         if (applicationFormFieldEntities == null || applicationFormFieldEntities.isEmpty()) {
             applicationFormFieldEntity.setApplicationForm(applicationFormEntity);
         } else {
-        	applicationFormFieldEntity.setApplicationForm(applicationFormEntity);
             for (ApplicationFormFieldEntity applicationFormFieldEntity1 : applicationFormFieldEntities) {
-                if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) {
+                if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId())) {
                     applicationFormFieldEntity = applicationFormFieldEntity1;
                     oldApplicationFormFieldData = Utils.getClonedEntityForData(applicationFormFieldEntity);
-                    if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm())) {
+                    if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) {
                         validateRequiredFields(applicationFormEntity.getForm(), applicationFormEntity.getApplication(), applicationFormFieldRequestBean.getFieldId());
                     }
                     actionType = VersionActionTypeEnum.UPDATE;
                     break;
+                } else {
+                    applicationFormFieldEntity.setApplicationForm(applicationFormEntity);
                 }
             }
         }