Skip to content

Null condition added #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mo839639 merged 2 commits into from
May 28, 2025
Merged

Null condition added #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c481b8
Null condition added
ravishanigarapu May 28, 2025
c5f0a0e
Null check
ravishanigarapu May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 27 additions & 25 deletions src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,33 +1486,35 @@ 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());
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);
if (null != getdemographicsData && 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());
response.setResponse(saveDemoData.toString());
}

} catch (Exception e) {
logger.error("Unexpected error:", e);
Expand Down
Loading