代码合并错误处理

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.search;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.core.util.SplitArray;
 import com.uas.platform.b2b.dao.DeputyOrderDao;
+import com.uas.platform.b2b.dao.DistributeDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;
 import com.uas.platform.b2b.dao.MakeAcceptDao;
@@ -945,7 +946,8 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		Set<SaleTenderItemErp> itemErps = new HashSet<>();
 		List<SaleTenderErp> tenderList = new ArrayList<>();
 		for (SaleTenderErp saleTenderErp : content) {
-			saleTenderErp.setSaleTenderItems(itemErps); // erp查看列表只返回主表信息
+            // erp查看列表只返回主表信息
+			saleTenderErp.setSaleTenderItems(itemErps);
 			tenderList.add(saleTenderErp);
 		}
 		sortByProperty(tenderList, SaleTenderErp.class, "id", idsPage.getContent());
@@ -962,22 +964,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<Vendor> searchCustCheckIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$VENDORS_CUST, pageParams);
 		List<Vendor> content = vendorDao.findAll(idsPage.getContent());
-
-		// 设置我方联系人列表
-		List<User> myContacts = new ArrayList<>();
-		for (Vendor vendor : content) {
-			List<Distribute> distributes = distributeDao.findByVendorId(vendor.getId());
-			for (Distribute distribute : distributes) {
-				User user = new User();
-				user.setUserUU(distribute.getUserUU());
-				user.setUserName(distribute.getUser().getUserName());
-				user.setUserTel(distribute.getUser().getUserTel());
-				user.setTransfer(1 == distribute.getIsTransfer());
-				user.setDistribute(true);
-				myContacts.add(user);
-			}
-			vendor.setMyContacts(myContacts);
-		}
 		sortByProperty(content, Vendor.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}