Index: ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js =================================================================== diff -u -r18171 -r19008 --- ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js (.../orgUnitExtView.js) (revision 18171) +++ ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js (.../orgUnitExtView.js) (revision 19008) @@ -162,13 +162,13 @@ callback:function(data){ if (data == 'success') { showResult("同步成功"); + reloadTreeAndTable(); } else if (data == 'error') { showResult("同步失败"); } else { showResult(data); } mask.hide(); - reloadTreeAndTable(); }, errorHandler:function(msg){ mask.hide(); @@ -366,7 +366,7 @@ grid = new Ext.ux.ForgonPageGrid({ tbar:tbar, pageSize:30, - defaultSortField:'sequenceNumber', + defaultSortField:'parent.id , sequenceNumber', defaultSortDirection:'ASC', isCheckboxSelectionModel:true, plugins: filters, Index: ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java =================================================================== diff -u -r17241 -r19008 --- ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java (.../OrgUnitTableManager.java) (revision 17241) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java (.../OrgUnitTableManager.java) (revision 19008) @@ -169,7 +169,7 @@ sql += " and po.parent.id = " + parentId; } } else { - sql += " and po.parent.id = " + parentId; + sql += " and (po.id = "+ parentId +" or po.parent.id = " + parentId + ")"; } } }