Index: ssts-web/src/main/resources/strtus_oa.xml
===================================================================
diff -u -r14950 -r14964
--- ssts-web/src/main/resources/strtus_oa.xml	(.../strtus_oa.xml)	(revision 14950)
+++ ssts-web/src/main/resources/strtus_oa.xml	(.../strtus_oa.xml)	(revision 14964)
@@ -45,7 +45,7 @@
         <action name="loadUserSearchMode" class="userAction" method="loadUserSearchMode"></action>
          <action name="updateDepartmentRoles" class="userAction" method="updateDepartmentRoles"></action>
          <!-- 加载所有的用户的用户名和姓名-->
-         <action name="getAllUserFillNameAndNameByUserName" class="userAction" method="getAllUserFillNameAndNameByUserName"></action>
+         <action name="getAllUserFullNameAndNameByUserName" class="userAction" method="getAllUserFullNameAndNameByUserName"></action>
     </package>
     <package name="systemmanage_role" namespace="/systemmanage/role" extends="struts-default" >
         <action name="loadForm" class="roleAction" method="loadForm"></action>
Index: forgon-core/src/main/java/com/forgon/security/service/UserManager.java
===================================================================
diff -u -r14949 -r14964
--- forgon-core/src/main/java/com/forgon/security/service/UserManager.java	(.../UserManager.java)	(revision 14949)
+++ forgon-core/src/main/java/com/forgon/security/service/UserManager.java	(.../UserManager.java)	(revision 14964)
@@ -71,5 +71,5 @@
 	 * @param userName：需要查找的用户名（支持模糊查询）
 	 * @return：List<String[]>
 	 */
-	public List<String[]> findAllUserFillNameAndNameByUserName(String userName);
+	public List<String[]> findAllUserFullNameAndNameByUserName(String userName);
 }
Index: forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
===================================================================
diff -u -r14949 -r14964
--- forgon-core/src/main/java/com/forgon/directory/action/UserAction.java	(.../UserAction.java)	(revision 14949)
+++ forgon-core/src/main/java/com/forgon/directory/action/UserAction.java	(.../UserAction.java)	(revision 14964)
@@ -7,6 +7,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
 import net.sf.json.util.PropertyFilter;
@@ -363,22 +364,21 @@
 	 * 获取所有用户的姓名和用户登录名
 	 * chenjiaru  2016-09-05
 	 */
-	public String getAllUserFillNameAndNameByUserName() {
+	public String getAllUserFullNameAndNameByUserName() {
 		try {
 			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
 			String userName = StrutsParamUtils.getPraramValue("userName", "");
 			
-			List<String[]> arrayList = userManager.findAllUserFillNameAndNameByUserName(userName);
-			
-			String jsonDataString = "[";
+			List<String[]> arrayList = userManager.findAllUserFullNameAndNameByUserName(userName);
+			JSONArray jSONArray = new JSONArray();
 			for (String[] stringArray : arrayList) {
-				jsonDataString += ("[\""+stringArray[0]+"\",\""+(stringArray[0]+"("+stringArray[1]+")")+"\"]"+",");
+				JSONArray jSONArrayTemp = new JSONArray();
+				jSONArrayTemp.add(stringArray[0]);
+				jSONArrayTemp.add(stringArray[0] + "(" + stringArray[1] + ")");
+				jSONArray.add(jSONArrayTemp);
 			}
-			if (!"[".equals(jsonDataString)) {
-				jsonDataString = jsonDataString.substring(0, jsonDataString.length() - 1);
-			}
-			jsonDataString += "]";
-			jsonDataString = jsonDataString.replaceAll("\r\n", "");  //数据怎么会出现回车换行的符号呢？
+			String jsonDataString = jSONArray.toString();
+			
 			StrutsParamUtils.getResponse().getWriter().println(jsonDataString);
 		} catch (Exception e) {
 			e.printStackTrace();
Index: forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
===================================================================
diff -u -r14949 -r14964
--- forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java	(.../OrgUnitAction.java)	(revision 14949)
+++ forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java	(.../OrgUnitAction.java)	(revision 14964)
@@ -397,15 +397,14 @@
 			
 			List<String[]> arrayList = orgUnitManager.findOrgUnitCodingAndNameByUserName(userName);
 			
-			
-			String jsonDataString = "[";
+			JSONArray jSONArray = new JSONArray();
 			for (String[] stringArray : arrayList) {
-				jsonDataString += ("[\""+stringArray[0]+"\",\""+(stringArray[1])+"\"]"+",");
+				JSONArray jSONArrayTemp = new JSONArray();
+				jSONArrayTemp.add(stringArray[0]);
+				jSONArrayTemp.add(stringArray[1]);
+				jSONArray.add(jSONArrayTemp);
 			}
-			if (!"[".equals(jsonDataString)) {
-				jsonDataString = jsonDataString.substring(0, jsonDataString.length() - 1);
-			}
-			jsonDataString += "]";
+			String jsonDataString = jSONArray.toString();
 			
 			StrutsParamUtils.getResponse().getWriter().println(jsonDataString);
 		} catch (Exception e) {
Index: forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
===================================================================
diff -u -r14949 -r14964
--- forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java	(.../UserManagerImpl.java)	(revision 14949)
+++ forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java	(.../UserManagerImpl.java)	(revision 14964)
@@ -515,7 +515,7 @@
 	 * @return：List
 	 */
 	@Override
-	public List<String[]> findAllUserFillNameAndNameByUserName(String userName) {
+	public List<String[]> findAllUserFullNameAndNameByUserName(String userName) {
 		String sql = "select name,fullName from SS_USERS where name like '%"+userName+"%'";
 		ResultSet rs = objectDao.executeSql(sql);
 		List<String[]> arrayList = new ArrayList<String[]>();
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingForm.js
===================================================================
diff -u -r14952 -r14964
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingForm.js	(.../userIPAndOrgUnitMappingForm.js)	(revision 14952)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingForm.js	(.../userIPAndOrgUnitMappingForm.js)	(revision 14964)
@@ -34,7 +34,7 @@
 	 */
 	var userNameJsonStore = new Ext.data.SimpleStore({
 		fields : [ 'userNameValue', 'userNameDisplay' ],
-		url : WWWROOT + '/systemmanage/user/getAllUserFillNameAndNameByUserName.do',
+		url : WWWROOT + '/systemmanage/user/getAllUserFullNameAndNameByUserName.do',
 		listeners : {
 			beforeload : function(thisCombo, options) {
 				userNameJsonStore.baseParams.userName = top.Ext.getCmp('userName').getRawValue();