Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bugfix_combine' into bugfix_combine
Browse files Browse the repository at this point in the history
  • Loading branch information
lani009 committed Jun 2, 2021
2 parents 1196b66 + 1f78ad3 commit 93705b8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion jmt_webapp/src/main/java/dao/impl/OrganizationDAO.java
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public List<Organization> getChildrenOf(Organization deptDiv, Organization govof
} else if (govofcDiv.getOrganizationName() == null) {
element = new GovofcDiv(rs.getString("govofc_div_cd"), rs.getString("govofc_div_nm"));
} else if (hgdeptDiv.getOrganizationName() == null) {
element = new HgdeptDiv(rs.getString("hgdpet_div_cd"), rs.getString("hgdept_div_nm"));
element = new HgdeptDiv(rs.getString("hgdept_div_cd"), rs.getString("hgdept_div_nm"));
} else if (dept.getOrganizationName() == null) {
element = new Dept(rs.getString("dept_nm_cd"), rs.getString("dept_nm"));
} else {
Expand Down

0 comments on commit 93705b8

Please sign in to comment.