Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r17493 -r17521
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 17493)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 17521)
@@ -697,13 +697,13 @@
 		List<String> nameList = new ArrayList<String>();
 		List<SupplyRoomConfig> firstSupplyRoomList = getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_1);
 		List<SupplyRoomConfig> secondSupplyRoomList = getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_2);
-		if(firstSupplyRoomList != null ){
+		if(CollectionUtils.isNotEmpty(firstSupplyRoomList) ){
 			for(SupplyRoomConfig src : firstSupplyRoomList){
 				String name = src.getOrgUnitName();
 				nameList.add(name);
 			}
 		}
-		if(secondSupplyRoomList != null ){
+		if(CollectionUtils.isNotEmpty(secondSupplyRoomList)){
 			for(SupplyRoomConfig src : secondSupplyRoomList){
 				String name = src.getOrgUnitName();
 				nameList.add(name);