Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java =================================================================== diff -u -r14452 -r14462 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 14452) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java (.../WareHouseManagerImpl.java) (revision 14462) @@ -109,7 +109,11 @@ for(WareHouse wareHouse : wareHouses){ if(wareHouse != null){ WareHouse findWh = retMap.get(wareHouse.getOrgUnitCode()); - if(findWh != null && findWh.getSequence().intValue() < wareHouse.getSequence().intValue()){ + if(findWh != null){ + if(findWh.getSequence().intValue() < wareHouse.getSequence().intValue()){ + retMap.put(wareHouse.getOrgUnitCode(), wareHouse); + } + }else{ retMap.put(wareHouse.getOrgUnitCode(), wareHouse); } }