Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r36921 -r36923
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 36921)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 36923)
@@ -8489,9 +8489,18 @@
 					supplierName = supplierName.toUpperCase();
 				}
 			}
+			//查询类型有supplier和contact,分别代表供应商和联系人
+			String queryType = params.optString("queryType", "supplier");
 			//供应商类型
 			String supplierType = Supplier.SUPPLIER_TYPE_RENTTOUSSE;
-			List<Map<String, Object>> mapList = supplierManager.findSupplierContactList("", supplierName);
+			List<Map<String, Object>> mapList = null;
+			//查询联系人
+			if(StringUtils.equals("contact", queryType)){
+				mapList = supplierManager.findSupplierContactList("", supplierName);
+			}else{
+				//否则就是查询供应商
+				mapList = supplierManager.searchSupplier(supplierName, supplierType, null);
+			}
 			JSONUtil.addDataProperty(result, JSONArray.fromObject(mapList));
 			JSONUtil.addSuccess(result, true);
 		} catch (Exception e) {