Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r26779 -r26789
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 26779)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 26789)
@@ -44,6 +44,7 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.directory.model.OrgUnit;
+import com.forgon.directory.model.OrgUserRelation;
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
@@ -1201,14 +1202,19 @@
 		}
 		JSONObject userObj = new JSONObject();
 		userObj.put("fullName", user.getFullName());
-		String unitCode = user.getCurrentOrgUnitCode();
-		if(StringUtils.isNotBlank(unitCode)){
-			OrgUnit orgUnit = orgUnitManager.getByCode(unitCode);
-			JSONObject orgUnitObj = new JSONObject();
-			orgUnitObj.put("orgUnitName", orgUnit.getName());
-			orgUnitObj.put("orgUnitNameCode", user.getCurrentOrgUnitCode());
-			userObj.put("userOrgUnit", orgUnitObj);
+		Set<OrgUserRelation> sd = user.getOrgUserRelations();
+		JSONArray orgUnits = new JSONArray();
+		if(sd != null){
+			for (OrgUserRelation orgUserRelation : sd) {
+				String orgUnitCoding = orgUserRelation.getOrgUnit().getOrgUnitCoding();
+				String orgUnitName = orgUserRelation.getOrgUnit().getName();
+				JSONObject orgUnitObj = new JSONObject();
+				orgUnitObj.put("orgUnitName", orgUnitName);
+				orgUnitObj.put("orgUnitNameCode", orgUnitCoding);
+				orgUnits.add(orgUnitObj);
+			}
 		}
+		userObj.put("orgUnits", orgUnits);
 		return userObj;
 	}