Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r36911 -r36921 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 36911) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 36921) @@ -8491,7 +8491,7 @@ } //供应商类型 String supplierType = Supplier.SUPPLIER_TYPE_RENTTOUSSE; - List> mapList = supplierManager.searchSupplier(supplierName, supplierType, null); + List> mapList = supplierManager.findSupplierContactList("", supplierName); JSONUtil.addDataProperty(result, JSONArray.fromObject(mapList)); JSONUtil.addSuccess(result, true); } catch (Exception e) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java =================================================================== diff -u -r33280 -r36921 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java (.../SupplierManagerImpl.java) (revision 33280) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java (.../SupplierManagerImpl.java) (revision 36921) @@ -1076,13 +1076,14 @@ + "%')"; //查询供应商所拥有的联系人 - sql += " and po.supplier.companyName = '" + supplierName + "'order by sequence asc"; + sql += " and po.supplier.companyName = '" + supplierName + "' order by sequence asc"; List supplierContactlist = (List)objectDao.findBySql(SupplierContact.class.getSimpleName(), sql); if(!supplierContactlist.isEmpty()){ for(SupplierContact supplierContact : supplierContactlist){ Map temp = new HashMap(); temp.put("id", supplierContact.getId()); temp.put("name", supplierContact.getContactName()); + temp.put("contactName", supplierContact.getContactName()); temp.put("phoneNumber", supplierContact.getPhoneNumber()); mapList.add(temp); }