UAS企业圈获取全部合作伙伴接口根据已存在UU过滤方法修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10193 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/AddPartnerServiceImpl.java

@@ -203,13 +203,13 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 	@Override
 	public Page<BasePartnersInfo> findByBusCodeAndKeyWordForERP(String keyword, Integer statusCode, int pageSize,
 			int pageNumber, List<Long> vendUUs, List<Long> custUUs) throws Exception {
-		Set<Long> vendUUSet = new HashSet<>();
-		vendUUSet.addAll(vendUUs);
-		Set<Long> custUUSet = new HashSet<>();
-		custUUSet.addAll(custUUs);
+	    // 供应商或客户存在一个即过滤
+		List<Long> partnerUUs = new ArrayList<>();
+		partnerUUs.addAll(vendUUs);
+		partnerUUs.addAll(custUUs);
 		String businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
-		Page<PartnershipRecord> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
-				pageSize);
+		Page<PartnershipRecord> pageRecords = AccountUtils.getRequestFilterByPartnerUUs(businessCode, statusCode, keyword, pageNumber,
+				pageSize, partnerUUs);
 		Page<BasePartnersInfo> partnerRecords = new Page<BasePartnersInfo>();
 		List<PartnershipRecord> records = pageRecords != null ? pageRecords.getContent() : null;
 		List<BasePartnersInfo> baseInfos = new ArrayList<BasePartnersInfo>();
@@ -242,7 +242,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setReason(record.getReason());
 					// 供应商
 					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getVendUID());
-					if (!CollectionUtils.isEmpty(vendor) && !vendUUSet.contains(vendor.get(0).getVendEnUU())) {
+					if (!CollectionUtils.isEmpty(vendor)) {
 						partner.setVendor(Constant.YES);
 						partner.setVendorId(vendor.get(0).getId());
 						partner.setVendswitch(vendor.get(0).getVendswitch());
@@ -251,7 +251,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					}
 					// 客户
 					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getVendUID(), businessCode);
-					if (!CollectionUtils.isEmpty(customer) && !custUUSet.contains(customer.get(0).getMyEnUU())) {
+					if (!CollectionUtils.isEmpty(customer)) {
 						partner.setCustomer(Constant.YES);
 						partner.setCustId(customer.get(0).getId());
 						partner.setCustswitch(customer.get(0).getCustswitch());
@@ -287,7 +287,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setReason(record.getReason());
 					// 供应商
 					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getCustUID());
-					if (!CollectionUtils.isEmpty(vendor) && !vendUUSet.contains(vendor.get(0).getMyEnUU())) {
+					if (!CollectionUtils.isEmpty(vendor)) {
 						partner.setVendor(Constant.YES);
 						partner.setVendorId(vendor.get(0).getId());
 						partner.setVendswitch(vendor.get(0).getVendswitch());
@@ -296,7 +296,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					}
 					// 客户
 					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getCustUID(), businessCode);
-					if (!CollectionUtils.isEmpty(customer) && !custUUSet.contains(vendor.get(0).getVendEnUU())) {
+					if (!CollectionUtils.isEmpty(customer)) {
 						partner.setCustomer(Constant.YES);
 						partner.setCustId(customer.get(0).getId());
 						partner.setCustswitch(customer.get(0).getCustswitch());
@@ -310,12 +310,12 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 			}
 		}
 		partnerRecords.setContent(baseInfos);
-		partnerRecords.setTotalElements(pageRecords != null ? baseInfos.size() : 0);
+		partnerRecords.setTotalElements(pageRecords != null ? pageRecords.getTotalElements() : 0);
 		return partnerRecords;
 	}
 
 	/**
-	 *  ERP企业圈获取全部合作伙伴
+	 * 获取全部合作伙伴
 	 * @param keyword
 	 * @param statusCode
 	 * @param pageSize

src/main/java/com/uas/platform/b2b/service/impl/InvitationRecordServiceImpl.java

@@ -1,21 +1,12 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;
+import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.InvitationRecord;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.InvitationRecordService;
 import com.uas.platform.b2b.support.MessageConf;
@@ -26,6 +17,12 @@ import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
 
 @Service
 public class InvitationRecordServiceImpl implements InvitationRecordService {
@@ -45,6 +42,9 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
+	@Autowired
+	private UserDao userDao;
+
 	/**
 	 * 短信接口
 	 */
@@ -61,6 +61,19 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 		}
 		Long useruu = SystemSession.getUser().getUserUU();
 		Long enuu = SystemSession.getUser().getEnterprise().getUu();
+		// UAS邀请注册通过Systemsession获取的用户UU不是当前用户UU，所以参数传过来
+		if (record.getUseruu() != null) { // 用户存在才设置进去，不然数据库会报错
+			User erpUser = userDao.findOne(record.getUseruu());
+			if (erpUser != null) {
+				useruu = record.getUseruu();
+			}
+		}
+		if (record.getEnuu() != null) { // 企业信息也一样
+			Enterprise enterprise = enterpriseDao.findOne(record.getEnuu());
+			if (enterprise != null) {
+				enuu = record.getEnuu();
+			}
+		}
 		Map<String, Object> model = new HashMap<String, Object>();
 		// 邮件信息
 		if (null != record.getVendusername()) {