Index: forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java =================================================================== diff -u -r33177 -r34254 --- forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java (.../UserManagerImpl.java) (revision 33177) +++ forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java (.../UserManagerImpl.java) (revision 34254) @@ -399,9 +399,11 @@ String orgCodesFilter = " 1=1 "; String joindepart = ""; boolean needDepart = ArrayUtils.isNotEmpty(orgUnitCodes); + String orderBySql = ""; if(needDepart){ orgCodesFilter = SqlBuilder.build_IN_Statement("o.orgUnitCoding", SqlBuilder.IN, orgUnitCodes); joindepart = "inner join OrgUserRelation ou on u.id = ou.userId inner join OrgUnit o on ou.orgUnitId = o.id"; + orderBySql = " order by ou.userOrder "; } String sql = "select u.id,u.fullName,u.name as name,"+(needDepart?"o.name as orgUnitName,":"")+"bd.barcode as barcode from SS_Users u inner join barcodeDevice bd on u.id=bd.id " + joindepart + " where " + @@ -422,7 +424,7 @@ } } - sql += " order by ou.userOrder "; + sql += orderBySql; ResultSet resultSet = objectDao.executeSql(sql); if (resultSet != null) {