Skip to content

Commit c5f0a0e

Browse files
Null check
1 parent 0c481b8 commit c5f0a0e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,9 +1486,9 @@ public String editUserDetails(@RequestBody String editUserDetails) {
14861486
getIdforedit.setContactNo(employeeMaster.getContactNo());
14871487
getIdforedit.setIsExternal(employeeMaster.getIsExternal());
14881488

1489-
M_User1 editedData = employeeMasterInter.saveeditedData(getIdforedit);
1489+
employeeMasterInter.saveeditedData(getIdforedit);
14901490
M_UserDemographics getdemographicsData = employeeMasterInter.DataByUserID(employeeMaster.getUserID());
1491-
if (null != demographics) {
1491+
if (null != getdemographicsData && null != demographics) {
14921492
getdemographicsData.setFathersName(demographics.getFathersName());
14931493
getdemographicsData.setMothersName(demographics.getMothersName());
14941494
getdemographicsData.setCommunityID(demographics.getCommunityID());
@@ -1510,10 +1510,11 @@ public String editUserDetails(@RequestBody String editUserDetails) {
15101510
getdemographicsData.setIsPresent(demographics.getIsPresent());
15111511
getdemographicsData.setDistrictID(demographics.getDistrictID());
15121512
getdemographicsData.setModifiedBy(demographics.getModifiedBy());
1513-
}
1514-
M_UserDemographics saveDemoData = employeeMasterInter.saveeditedDemoData(getdemographicsData);
1513+
1514+
M_UserDemographics saveDemoData = employeeMasterInter.saveeditedDemoData(getdemographicsData);
15151515

1516-
response.setResponse(saveDemoData.toString());
1516+
response.setResponse(saveDemoData.toString());
1517+
}
15171518

15181519
} catch (Exception e) {
15191520
logger.error("Unexpected error:", e);

0 commit comments

Comments
 (0)