Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
===================================================================
diff -u -r16317 -r16419
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java	(.../SupplierManager.java)	(revision 16317)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java	(.../SupplierManager.java)	(revision 16419)
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import net.sf.json.JSONObject;
-
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier;
 
 
@@ -32,9 +30,7 @@
 	public List<Supplier> getSupplierProvidingTousse();
 	
 	List<Map<String, Object>> searchSupplier(String inputText, String type);
-	// public JSONObject searchSupplier(String inputText,String type);
 
 	public String getSupplierByType(String type, String searchString, String returnFields);
 	
-	public List<Supplier> getSupplierList(String type, String searchString);
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
===================================================================
diff -u -r16317 -r16419
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java	(.../SupplierAction.java)	(revision 16317)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java	(.../SupplierAction.java)	(revision 16419)
@@ -1,7 +1,6 @@
 package com.forgon.disinfectsystem.basedatamanager.supplier.action;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.List;
@@ -11,8 +10,6 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.forgon.tools.util.PageUtil;
-import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
 import net.sf.json.util.PropertyFilter;
@@ -28,6 +25,7 @@
 import com.forgon.systemsetting.service.HttpOptionManager;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.json.JsonPropertyFilter;
+import com.forgon.tools.util.PageUtil;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
 
@@ -161,29 +159,6 @@
 		}
 	}
 	
-	public void getCompanyList(){
-		
-		String searchString = StrutsParamUtils.getPraramValue("searchString", "");
-		//供应商类型
-		String type = StrutsParamUtils.getPraramValue("type", "");
-		List<Supplier> list = supplierManager.getSupplierList(type, searchString);
-		JSONArray array = new JSONArray();
-		if(list != null){
-			for (Supplier supplier : list) {
-				JSONObject obj = new JSONObject();
-				obj.put("id", supplier.getId());
-				obj.put("companyName", supplier.getCompanyName());
-				array.add(obj);
-			}
-		}
-		HttpServletResponse response = StrutsParamUtils.getResponse();
-		try {
-			response.setCharacterEncoding("utf-8");
-			response.getWriter().print(array.toString());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
 	/**
 	 * 获取外来器械供应室Json字符串
 	 * @return
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
===================================================================
diff -u -r16317 -r16419
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java	(.../SupplierManagerImpl.java)	(revision 16317)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java	(.../SupplierManagerImpl.java)	(revision 16419)
@@ -8,7 +8,6 @@
 import java.util.regex.Pattern;
 
 import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -65,6 +64,7 @@
 			hql += " and id != " + id;
 		}
 		
+		@SuppressWarnings("unchecked")
 		List<Supplier> supplierList = objectDao.findByHql(hql);
 		if (supplierList != null) {  //如果此公司名称已经存在
 			for (Supplier supplier : supplierList) {
@@ -183,10 +183,14 @@
 
 	@Override
 	public List<Map<String, Object>> searchSupplier(String inputText, String type) {
+		
 		String sql = "where (po.spelling like '%" + inputText
 				   + "%' or po.wbCode like '%" + inputText
 				   + "%' or po.companyName like '%" + inputText
-				   + "%') and po.rentTousse = '" + type + "'";
+				   + "%')";
+		if(StringUtils.isNotBlank(type)){
+			sql += " and po.rentTousse = '" + type + "'";
+		}
 		@SuppressWarnings("unchecked")
 		List<Supplier> suppliers = objectDao.findBySql(Supplier.class.getSimpleName(), sql);
 		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
@@ -198,34 +202,5 @@
 		}
 		return mapList;
 	}
-	/*@Override
-	public JSONObject searchSupplier(String inputText, String type) {
-		String sql = "where (po.spelling like '%" + inputText
-				   + "%' or po.wbCode like '%" + inputText
-				   + "%' or po.companyName like '%" + inputText
-				   + "%') and po.rentTousse = '" + type + "'";
-		@SuppressWarnings("unchecked")
-		List<Supplier> suppliers = objectDao.findBySql(Supplier.class.getSimpleName(), sql);
-		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-		for (Supplier supplier : suppliers) {
-			Map<String, Object> temp = new HashMap<String, Object>();
-			temp.put("id", supplier.getId());
-			temp.put("name", supplier.getCompanyName());
-			mapList.add(temp);
-		}
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("totalCount", suppliers.size());
-		map.put("data", mapList);
-		return JSONObject.fromObject(map);
-	}*/
 
-	@Override
-	public List<Supplier> getSupplierList(String type, String searchString) {
-		String sql = createQuerySQL(searchString);
-		if(StringUtils.isNotBlank(type)){
-			sql += " and po.rentTousse = '" + type + "'";
-		}
-		return objectDao.findBySql(Supplier.class.getSimpleName(), sql);
-	}
-
 }