Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java =================================================================== diff -u -r12773 -r12781 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 12773) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 12781) @@ -84,7 +84,8 @@ sql += " and ( "; if(orgUnit.getId() != null && orgUnit.getId() != 0){ sql += " orgUnitId = " + orgUnit.getId(); - }else if(StringUtils.isNotBlank(orgUnit.getOrgUnitCoding())){ + } + if(StringUtils.isNotBlank(orgUnit.getOrgUnitCoding())){ sql += " or orgUnitCode = '" + orgUnit.getOrgUnitCoding() + "'"; } sql += " ) ";