Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r20041 -r20055 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20041) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 20055) @@ -1262,19 +1262,19 @@ */ public String getAwaitForQuickRecyclingTousse() { int supplyRoomType = 0; - String loginUserCode = AcegiHelper.getLoginUser() + String loginUserOrgUnitCoding = AcegiHelper.getLoginUser() .getOrgUnitCodingFromSupplyRoomConfig(); SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager .getFirstSupplyRoomConfig(); if (StringUtils.equals(firstSupplyRoom.getOrgUnitCoding(), - loginUserCode)) { + loginUserOrgUnitCoding)) { supplyRoomType = 1; } else { List secondRooms = supplyRoomConfigManager .getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM); for (SupplyRoomConfig config : secondRooms) { - if (StringUtils.equals(loginUserCode, config.getOrgUnitCoding())) { + if (StringUtils.equals(loginUserOrgUnitCoding, config.getOrgUnitCoding())) { supplyRoomType = 2; break; }