Skip to content

Commit 0c481b8

Browse files
Null condition added
1 parent d9baff2 commit 0c481b8

1 file changed

Lines changed: 23 additions & 22 deletions

File tree

src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,28 +1488,29 @@ public String editUserDetails(@RequestBody String editUserDetails) {
14881488

14891489
M_User1 editedData = employeeMasterInter.saveeditedData(getIdforedit);
14901490
M_UserDemographics getdemographicsData = employeeMasterInter.DataByUserID(employeeMaster.getUserID());
1491-
getdemographicsData.setFathersName(demographics.getFathersName());
1492-
getdemographicsData.setMothersName(demographics.getMothersName());
1493-
getdemographicsData.setCommunityID(demographics.getCommunityID());
1494-
getdemographicsData.setReligionID(demographics.getReligionID());
1495-
getdemographicsData.setAddressLine1(demographics.getAddressLine1());
1496-
getdemographicsData.setAddressLine2(demographics.getAddressLine2());
1497-
1498-
getdemographicsData.setPermAddressLine1(demographics.getPermAddressLine1());
1499-
getdemographicsData.setPermAddressLine2(demographics.getPermAddressLine2());
1500-
getdemographicsData.setPermStateID(demographics.getPermStateID());
1501-
getdemographicsData.setPermDistrictID(demographics.getPermDistrictID());
1502-
getdemographicsData.setPermPinCode(demographics.getPermPinCode());
1503-
getdemographicsData.setPermanentAddress(demographics.getPermanentAddress());
1504-
getdemographicsData.setCityID(demographics.getCityID());
1505-
getdemographicsData.setStateID(demographics.getStateID());
1506-
getdemographicsData.setCountryID(demographics.getCountryID());
1507-
getdemographicsData.setPinCode(demographics.getPinCode());
1508-
getdemographicsData.setIsPermanent(demographics.getIsPermanent());
1509-
getdemographicsData.setIsPresent(demographics.getIsPresent());
1510-
getdemographicsData.setDistrictID(demographics.getDistrictID());
1511-
getdemographicsData.setModifiedBy(demographics.getModifiedBy());
1512-
1491+
if (null != demographics) {
1492+
getdemographicsData.setFathersName(demographics.getFathersName());
1493+
getdemographicsData.setMothersName(demographics.getMothersName());
1494+
getdemographicsData.setCommunityID(demographics.getCommunityID());
1495+
getdemographicsData.setReligionID(demographics.getReligionID());
1496+
getdemographicsData.setAddressLine1(demographics.getAddressLine1());
1497+
getdemographicsData.setAddressLine2(demographics.getAddressLine2());
1498+
1499+
getdemographicsData.setPermAddressLine1(demographics.getPermAddressLine1());
1500+
getdemographicsData.setPermAddressLine2(demographics.getPermAddressLine2());
1501+
getdemographicsData.setPermStateID(demographics.getPermStateID());
1502+
getdemographicsData.setPermDistrictID(demographics.getPermDistrictID());
1503+
getdemographicsData.setPermPinCode(demographics.getPermPinCode());
1504+
getdemographicsData.setPermanentAddress(demographics.getPermanentAddress());
1505+
getdemographicsData.setCityID(demographics.getCityID());
1506+
getdemographicsData.setStateID(demographics.getStateID());
1507+
getdemographicsData.setCountryID(demographics.getCountryID());
1508+
getdemographicsData.setPinCode(demographics.getPinCode());
1509+
getdemographicsData.setIsPermanent(demographics.getIsPermanent());
1510+
getdemographicsData.setIsPresent(demographics.getIsPresent());
1511+
getdemographicsData.setDistrictID(demographics.getDistrictID());
1512+
getdemographicsData.setModifiedBy(demographics.getModifiedBy());
1513+
}
15131514
M_UserDemographics saveDemoData = employeeMasterInter.saveeditedDemoData(getdemographicsData);
15141515

15151516
response.setResponse(saveDemoData.toString());

0 commit comments

Comments
 (0)