Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r28885 -r28912 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 28885) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 28912) @@ -292,8 +292,7 @@ CssdServiceDepts.class.getSimpleName(), AcegiHelper.getCurrentOrgUnitCode(), TousseDefinition.PACKAGE_TYPE_INSIDE); - String sql = "where po.orgUnitCoding in (" + serviceDeptSQL + ")"; - + String sql = "where po.orgUnitCoding in (" + serviceDeptSQL + ") and po.orgUnitCoding in (select orgUnitCoding from "+ OrgUnit.class.getSimpleName() +" ) "; Pattern pat = Pattern.compile("[\\u4E00-\\u9FA5]+"); Matcher m = pat.matcher(simpleSpell); String searchMode = AcegiHelper.getLoginUser().getSearchMode();