From 0c481b80af4a8992c9b5e2b18a532f18a52bb89b Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 28 May 2025 08:49:43 +0530 Subject: [PATCH 1/2] Null condition added --- .../EmployeeMasterController.java | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java index 4e83bdf..b722e7f 100644 --- a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java +++ b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java @@ -1488,28 +1488,29 @@ public String editUserDetails(@RequestBody String editUserDetails) { M_User1 editedData = employeeMasterInter.saveeditedData(getIdforedit); M_UserDemographics getdemographicsData = employeeMasterInter.DataByUserID(employeeMaster.getUserID()); - getdemographicsData.setFathersName(demographics.getFathersName()); - getdemographicsData.setMothersName(demographics.getMothersName()); - getdemographicsData.setCommunityID(demographics.getCommunityID()); - getdemographicsData.setReligionID(demographics.getReligionID()); - getdemographicsData.setAddressLine1(demographics.getAddressLine1()); - getdemographicsData.setAddressLine2(demographics.getAddressLine2()); - - getdemographicsData.setPermAddressLine1(demographics.getPermAddressLine1()); - getdemographicsData.setPermAddressLine2(demographics.getPermAddressLine2()); - getdemographicsData.setPermStateID(demographics.getPermStateID()); - getdemographicsData.setPermDistrictID(demographics.getPermDistrictID()); - getdemographicsData.setPermPinCode(demographics.getPermPinCode()); - getdemographicsData.setPermanentAddress(demographics.getPermanentAddress()); - getdemographicsData.setCityID(demographics.getCityID()); - getdemographicsData.setStateID(demographics.getStateID()); - getdemographicsData.setCountryID(demographics.getCountryID()); - getdemographicsData.setPinCode(demographics.getPinCode()); - getdemographicsData.setIsPermanent(demographics.getIsPermanent()); - getdemographicsData.setIsPresent(demographics.getIsPresent()); - getdemographicsData.setDistrictID(demographics.getDistrictID()); - getdemographicsData.setModifiedBy(demographics.getModifiedBy()); - + if (null != demographics) { + getdemographicsData.setFathersName(demographics.getFathersName()); + getdemographicsData.setMothersName(demographics.getMothersName()); + getdemographicsData.setCommunityID(demographics.getCommunityID()); + getdemographicsData.setReligionID(demographics.getReligionID()); + getdemographicsData.setAddressLine1(demographics.getAddressLine1()); + getdemographicsData.setAddressLine2(demographics.getAddressLine2()); + + getdemographicsData.setPermAddressLine1(demographics.getPermAddressLine1()); + getdemographicsData.setPermAddressLine2(demographics.getPermAddressLine2()); + getdemographicsData.setPermStateID(demographics.getPermStateID()); + getdemographicsData.setPermDistrictID(demographics.getPermDistrictID()); + getdemographicsData.setPermPinCode(demographics.getPermPinCode()); + getdemographicsData.setPermanentAddress(demographics.getPermanentAddress()); + getdemographicsData.setCityID(demographics.getCityID()); + getdemographicsData.setStateID(demographics.getStateID()); + getdemographicsData.setCountryID(demographics.getCountryID()); + getdemographicsData.setPinCode(demographics.getPinCode()); + getdemographicsData.setIsPermanent(demographics.getIsPermanent()); + getdemographicsData.setIsPresent(demographics.getIsPresent()); + getdemographicsData.setDistrictID(demographics.getDistrictID()); + getdemographicsData.setModifiedBy(demographics.getModifiedBy()); + } M_UserDemographics saveDemoData = employeeMasterInter.saveeditedDemoData(getdemographicsData); response.setResponse(saveDemoData.toString()); From c5f0a0ea063df8930704c8a136d77da91d8e9bfa Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 28 May 2025 09:06:49 +0530 Subject: [PATCH 2/2] Null check --- .../employeemaster/EmployeeMasterController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java index b722e7f..701d68c 100644 --- a/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java +++ b/src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java @@ -1486,9 +1486,9 @@ public String editUserDetails(@RequestBody String editUserDetails) { getIdforedit.setContactNo(employeeMaster.getContactNo()); getIdforedit.setIsExternal(employeeMaster.getIsExternal()); - M_User1 editedData = employeeMasterInter.saveeditedData(getIdforedit); + employeeMasterInter.saveeditedData(getIdforedit); M_UserDemographics getdemographicsData = employeeMasterInter.DataByUserID(employeeMaster.getUserID()); - if (null != demographics) { + if (null != getdemographicsData && null != demographics) { getdemographicsData.setFathersName(demographics.getFathersName()); getdemographicsData.setMothersName(demographics.getMothersName()); getdemographicsData.setCommunityID(demographics.getCommunityID()); @@ -1510,10 +1510,11 @@ public String editUserDetails(@RequestBody String editUserDetails) { getdemographicsData.setIsPresent(demographics.getIsPresent()); getdemographicsData.setDistrictID(demographics.getDistrictID()); getdemographicsData.setModifiedBy(demographics.getModifiedBy()); - } - M_UserDemographics saveDemoData = employeeMasterInter.saveeditedDemoData(getdemographicsData); + + M_UserDemographics saveDemoData = employeeMasterInter.saveeditedDemoData(getdemographicsData); - response.setResponse(saveDemoData.toString()); + response.setResponse(saveDemoData.toString()); + } } catch (Exception e) { logger.error("Unexpected error:", e);