Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/controller/SupplyRoomConfigController.java
===================================================================
diff -u -r24708 -r24716
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/controller/SupplyRoomConfigController.java	(.../SupplyRoomConfigController.java)	(revision 24708)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/controller/SupplyRoomConfigController.java	(.../SupplyRoomConfigController.java)	(revision 24716)
@@ -4,14 +4,12 @@
 package com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.controller;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 import net.sf.json.JSONObject;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -59,29 +57,14 @@
 		}
 		
 		List<Map<String, Object>> list = new LinkedList<>();
-		if (orgUnitList != null) {
-			for (int j = 0,size = orgUnitList.size(); j < size; j++) {
-				Map<String, Object> reMap = new HashMap<>();
-				String orgCoding = orgUnitList.get(j).getOrgUnitCoding();
-				String orgName = null;
-				if (StringUtils.equals(withoutBaseOrg, "true")) {
-					orgName = orgUnitList.get(j).getName();
-				} else {
-					orgName = orgUnitList.get(j).getCurrentOrgUnitNames();
-					orgName = orgName.replace("组织机构－", "");
-				}
-//				orgName = StringEscapeUtils.escapeEcmaScript(orgName);
-				reMap.put("id",orgCoding);
-				reMap.put("departCode",orgCoding);
-				reMap.put("name",orgName);
-				list.add(reMap);
-			}
+		if (orgUnitList == null) {
+			orgUnitList = new ArrayList<OrgUnit>();
 		}
 		PageInfo pageInfo = PageUtil.getSpringPageInfo();
-		List<Map<String, Object>> reList = PageUtil.page(pageInfo, list);
-		json.put(pageInfo.getRowsKey(), reList);
-		json.put(pageInfo.getTotalKey(), list.size());
-//        pageEntity.setNeedToEscape(true);
+		List<Map<String, Object>> reList = PageUtil.page(pageInfo, orgUnitList);
+		json.put(pageInfo.getRowsKey(), JSONUtil.toJSONArrayWithInclude(reList, new String[]{"id","departCode","name"}));
+		json.put(pageInfo.getTotalKey(), orgUnitList.size());
+		
 		return json.toString();
 	}
 }