Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java =================================================================== diff -u -r16366 -r16370 --- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java (.../OrgUnitManagerImpl.java) (revision 16366) +++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java (.../OrgUnitManagerImpl.java) (revision 16370) @@ -1062,7 +1062,24 @@ sql += " and tousseType = '" + type + "'"; } } - return objectDao.findBySql(CssdServiceDepts.class.getSimpleName(), sql); + String querySql = "select distinct cssdOrgUnitCode,cssdOrgUnitName from " + CssdServiceDepts.class.getSimpleName() + " po " + sql; + List cssdServiceDeptsList = new ArrayList(); + ResultSet rs = null; + try{ + rs = objectDao.executeSql(querySql); + CssdServiceDepts cssdServiceDepts = null; + while(rs.next()){ + cssdServiceDepts = new CssdServiceDepts(); + cssdServiceDepts.setCssdOrgUnitCode(rs.getString("cssdOrgUnitCode")); + cssdServiceDepts.setCssdOrgUnitName(rs.getString("cssdOrgUnitName")); + cssdServiceDeptsList.add(cssdServiceDepts); + } + }catch(Exception e){ + e.printStackTrace(); + }finally{ + DatabaseUtil.closeResultSetAndStatement(rs); + } + return cssdServiceDeptsList; } @Override