邀请注册获取数据判断方法更新

src/main/java/com/uas/platform/b2b/controller/AddPartnerController.java

@@ -1,8 +1,20 @@
 package com.uas.platform.b2b.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.model.AddPartner;
+import com.uas.platform.b2b.service.AddPartnerService;
+import com.uas.platform.b2b.support.SPageUtils;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
 import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.model.Status;
+import com.uas.platform.core.web.bind.RequestState;
+import com.uas.search.b2b.model.SPage;
 import com.uas.sso.entity.PartnershipRecordView;
+import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -13,18 +25,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.sso.util.AccountUtils;
-import com.uas.platform.b2b.model.AddPartner;
-import com.uas.platform.b2b.service.AddPartnerService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.Status;
-import com.uas.platform.core.web.bind.RequestState;
-import com.uas.search.b2b.model.SPage;
-
 /**
  * 添加合作伙伴
  * 
@@ -51,7 +51,7 @@ public class AddPartnerController {
 	@RequestMapping(value = "/request", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<BasePartnersInfo> getAllRequest(PageParams params, String keyword) throws Exception {
-		return addPartnerService.findByBusCodeAndKeyWord(keyword, null, params.getCount(), params.getPage());
+		return SPageUtils.covert(addPartnerService.findByBusCodeAndKeyWord(keyword, null, params.getCount(), params.getPage()));
 	}
 
 	/**
@@ -66,8 +66,8 @@ public class AddPartnerController {
 	@RequestMapping(value = "/request", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<BasePartnersInfo> getTodoRequest(PageParams params, String keyword) throws Exception {
-		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAUDIT.value(), params.getCount(),
-				params.getPage());
+		return SPageUtils.covert(addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAUDIT.value(), params.getCount(),
+				params.getPage()));
 	}
 
 	/**
@@ -81,8 +81,8 @@ public class AddPartnerController {
 	@RequestMapping(value = "/request", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<BasePartnersInfo> getDoneRequest(PageParams params, String keyword) throws Exception {
-		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.ENABLED.value(), params.getCount(),
-				params.getPage());
+		return SPageUtils.covert(addPartnerService.findByBusCodeAndKeyWord(keyword, Status.ENABLED.value(), params.getCount(),
+				params.getPage()));
 	}
 
 	/**
@@ -96,8 +96,8 @@ public class AddPartnerController {
 	@RequestMapping(value = "/request", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<BasePartnersInfo> getEndRequest(PageParams params, String keyword) throws Exception {
-		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAPPLY.value(), params.getCount(),
-				params.getPage());
+		return SPageUtils.covert(addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAPPLY.value(), params.getCount(),
+				params.getPage()));
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/erp/controller/UserSpaceDetailController.java

@@ -108,7 +108,8 @@ public class UserSpaceDetailController {
 			} else {
 				pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 			}
-			if (ifSelf == 1) { // 只看自己就加入自己uu过滤，查看所有就加入已激活状态，只显示已注册邀请。
+			// 只看自己就加入自己uu过滤，查看所有就加入已激活状态，只显示已注册邀请。
+			if (ifSelf == 1) {
 				if (pageInfo.getUseruu() != null) {
 					// 如果传入的uu在本企业找不到角色，就返回空
 					User user = userService.findUserByEnUUAndUserUU(SystemSession.getUser().getEnterprise().getUu(), pageInfo.getUseruu());
@@ -188,8 +189,6 @@ public class UserSpaceDetailController {
 	public Page<B2BCustomer> getCustomers(@RequestParam("pageInfo") String pageInfo) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(pageInfo, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
-//		customer = URLDecoder.decode(customer, "UTF-8");
-//		List<Object> custUUs = JSON.parseArray(customer, Object.class);
 		String keyword = info.getKeyword();
 		com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams();
 		pageParams.setSize(info.getPageSize());
@@ -198,7 +197,6 @@ public class UserSpaceDetailController {
 		map.put("ve_vendenuu", SystemSession.getUser().getEnterprise().getUu());
 		map.put("ve_custswitch", Constant.YES);
 		ModelMap notMap = new ModelMap();
-//        notMap.put("ve_myenuu", new MultiValue(custUUs, true));
 		pageParams.setNotEqualFilters(notMap);
 		List<Sort> sortList = new ArrayList<>();
 		SearchFilter filter = userService.distribute();
@@ -229,16 +227,8 @@ public class UserSpaceDetailController {
 	public Page<BasePartnersInfo> getDoneRequest(@RequestParam("data") String data) throws Exception {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
-//		vendor = URLDecoder.decode(vendor, "UTF-8");
-//		List<Long> vendUUs = JSON.parseArray(vendor, Long.class);
-//		customer = URLDecoder.decode(customer, "UTF-8");
-//		List<Long> custUUs = JSON.parseArray(customer, Long.class);
-		String keyword = info.getKeyword();
-		PageParams pageParams = new PageParams();
-		pageParams.setSize(info.getPageSize());
-		pageParams.setPage(info.getPageNumber());
-		return addPartnerService.findByBusCodeAndKeyWordForERP(keyword, Status.ENABLED.value(), pageParams.getSize(),
-				pageParams.getPage());
+		return addPartnerService.findByBusCodeAndKeyWord(info.getKeyword(), Status.ENABLED.value(), info.getPageSize(),
+                info.getPageNumber());
 	}
 
 

src/main/java/com/uas/platform/b2b/model/PurchaseForecastAllItem.java

@@ -9,6 +9,9 @@ import java.util.Date;
 
 /**
  * 采购预测单明细
+ * 
+ * @author hejq
+ * @date 2018-07-25 16:19
  */
 @Table(name = "purc$forecastitems")
 @Entity

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -436,7 +436,7 @@ public class ProductUtils {
         try {
             HashMap<String, Object> map = new HashMap<>(1);
             map.put("ids", ListToString(idList, ","));
-            res = HttpUtil.sendGetRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/get/findByEnUUAndCode", map);
+            res = HttpUtil.sendGetRequest("http://localhost:8080" + "/product/get/findByIds", map);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -494,5 +494,4 @@ public class ProductUtils {
         return buffer;
     }
 
-
 }

src/main/java/com/uas/platform/b2b/service/AddPartnerService.java

@@ -1,79 +1,55 @@
 package com.uas.platform.b2b.service;
 
-import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.AddPartner;
 import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.search.b2b.model.SPage;
+import com.uas.sso.support.Page;
 import org.springframework.ui.ModelMap;
 
-import java.util.List;
 
+/**
+ * 添加合作伙伴接口
+ *
+ * @author hejq
+ * @date 2018-07-25 16:15
+ */
 public interface AddPartnerService {
 
-	/**
-	 * 向指定的企业发出建立合作关系请求
-	 * 
-	 * @param uu
-	 * @return
-	 */
-	public AddPartner addNewPartner(Long uu);
-
-	/**
-	 * 同意请求
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public AddPartner agreeRequest(Long id);
-
-	/**
-	 * 拒绝请求
-	 * 
-	 * @param id
-	 * @param reason
-	 * @return
-	 */
-	public AddPartner refuseRequest(Long id, String reason);
-
 	/**
 	 * 再次申请建立合作关系
 	 * 
-	 * @param id
+	 * @param id 合作伙伴id
 	 * @return
 	 */
-	public AddPartner reapply(Long id);
+	AddPartner reapply(Long id);
 
-	/**
-	 * 新收到的未处理的请求数量
-	 * 
-	 * @return
-	 */
-	public Object getMyMessageTodoCount();
 
 	/**
 	 * 添加为供应商
 	 * 
-	 * @param id
+	 * @param businessCode 供应商营业执照
 	 * @return
 	 */
-	public ModelMap addSupplier(String businessCode);
+	ModelMap addSupplier(String businessCode);
 
 	/**
 	 * 添加为客户
 	 * 
-	 * @param id
+	 * @param businessCode 客户营业执照
 	 * @return
 	 */
-	public ModelMap addCust(String businessCode);
+	ModelMap addCust(String businessCode);
 
 	/**
-	 * 分页查询请求
-	 * 
-	 * @param businessCode
-	 * @param keyword
+	 * 分页查询邀请注册记录
+	 *
+	 * @param keyword 关键字
+	 * @param statusCode 状态码
+	 * @param pageSize 分页大小
+	 * @param pageNumber 页码
 	 * @return
+	 * @throws Exception
 	 */
-	public SPage<BasePartnersInfo> findByBusCodeAndKeyWord(String keyword, Integer statusCode, int pageSize,
+	Page<BasePartnersInfo> findByBusCodeAndKeyWord(String keyword, Integer statusCode, int pageSize,
 			int pageNumber) throws Exception;
 
 	/**
@@ -82,18 +58,13 @@ public interface AddPartnerService {
 	 * @return
 	 * @throws Exception
 	 */
-	public ModelMap requestAmount() throws Exception;
-
-	/**
-	 *  ERP企业圈获取全部合作伙伴
-	 * @param keyword
-	 * @param statusCode
-	 * @param pageSize
-	 * @param pageNumber
-	 * @return
-	 * @throws Exception
-	 */
-    Page<BasePartnersInfo> findByBusCodeAndKeyWordForERP(String keyword, Integer statusCode, int pageSize, int pageNumber) throws Exception;
+	ModelMap requestAmount() throws Exception;
 
+    /**
+     * 添加服务商
+     *
+     * @param businessCode 服务商营业执照
+     * @return
+     */
     ModelMap addServicer(String businessCode);
 }

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

@@ -1,36 +1,35 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.temporary.model.PartnershipRecord;
-import com.uas.sso.entity.PartnershipRecordView;
-import com.uas.sso.support.Page;
-import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.AddPartnerService;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
-import com.uas.search.b2b.model.SPage;
+import com.uas.sso.entity.PartnershipRecordView;
+import com.uas.sso.support.Page;
+import com.uas.sso.util.AccountUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
+/**
+ * 添加合作伙伴
+ * 
+ * @author hejq
+ * @date 2018-07-25 16:16
+ */
 @Service
 public class AddPartnerServiceImpl implements AddPartnerService {
 
-	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
 	@Autowired
 	private AddPartnerDao addPartnerDao;
 
@@ -49,77 +48,6 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 	@Autowired
 	private UserOrderDao userOrderDao;
 
-	@Override
-	public AddPartner addNewPartner(Long uu) {
-		AddPartner adpa = addPartnerDao.findByClientuuAndSupplieruu(SystemSession.getUser().getEnterprise().getUu(),
-				uu);
-		List<Vendor> vendor = vendorDao.findByMyEnUUAndVendUU(SystemSession.getUser().getEnterprise().getUu(), uu);
-		if (!CollectionUtils.isEmpty(vendor)) {
-			throw new IllegalAccessError("该企业已是您的供应商，请不要重复申请");
-		}
-		AddPartner adp = new AddPartner();
-		if (adpa != null) {
-			if (adpa.getApplyStatuscode() == Status.NOT_REPLY.value()) {
-				throw new IllegalAccessError("对该企业的申请已存在，请不要重复申请");
-			}
-		} else {
-			Enterprise enter = enterpriseDao.findEnterpriseByUu(uu);
-			adp.setApplydate(new Date());
-			adp.setApplyStatus(Status.NOT_REPLY.getPhrase());
-			adp.setApplyStatuscode(Status.NOT_REPLY.value());
-			adp.setApplicant(SystemSession.getUser().getUserName());
-			adp.setApplicantuu(SystemSession.getUser().getUserUU());
-			adp.setClient(SystemSession.getUser().getEnterprise().getEnName());
-			adp.setClientuu(SystemSession.getUser().getEnterprise().getUu());
-			adp.setSupplier(enter.getEnName());
-			adp.setSupplieruu(uu);
-			logger.log("请求建立合作关系",
-					"[" + adp.getClient() + "]的[" + adp.getApplicant() + "]向[" + adp.getSupplier() + "]申请建立合作关系");
-		}
-		return addPartnerDao.save(adp);
-	}
-
-	@Override
-	public AddPartner agreeRequest(Long id) {
-		AddPartner adp = addPartnerDao.findOne(id);
-		adp.setAuditor(SystemSession.getUser().getUserName());
-		adp.setAuditoruu(SystemSession.getUser().getUserUU());
-		adp.setApplyStatus(Status.AGREED.getPhrase());
-		adp.setApplyStatuscode(Status.AGREED.value());
-		adp.setAuditdate(new Date());
-		logger.log("同意合作关系请求",
-				"[" + adp.getSupplier() + "]的[" + adp.getAuditor() + "]同意了[" + adp.getApplicant() + "的请求");
-		Vendor vendor = new Vendor();
-		Enterprise vendenter = enterpriseDao.findEnterpriseByUu(adp.getSupplieruu());
-		Enterprise myenter = enterpriseDao.findEnterpriseByUu(adp.getClientuu());
-		UserBaseInfo venduser = userBaseInfoDao.findByUserUU(adp.getAuditoruu());
-		UserBaseInfo myuser = userBaseInfoDao.findByUserUU(adp.getApplicantuu());
-		vendor.setMyEnterprise(myenter);
-		vendor.setMyEnUU(adp.getClientuu());
-		vendor.setMyUser(myuser);
-		vendor.setMyUserUU(adp.getApplicantuu());
-		vendor.setVendorEnterprise(vendenter);
-		vendor.setVendorUser(venduser);
-		vendor.setVendUserUU(adp.getAuditoruu());
-		vendor.setVendEnUU(adp.getSupplieruu());
-		vendorDao.save(vendor);
-		return addPartnerDao.save(adp);
-	}
-
-	@Override
-	public AddPartner refuseRequest(Long id, String reason) {
-		AddPartner adp = addPartnerDao.findOne(id);
-		adp.setAuditdate(new Date());
-		adp.setAuditor(SystemSession.getUser().getUserName());
-		adp.setAuditoruu(SystemSession.getUser().getUserUU());
-		adp.setReason(reason);
-		adp.setApplyStatus(Status.NOTAGREED.getPhrase());
-		adp.setApplyStatuscode(Status.NOTAGREED.value());
-		logger.log("拒绝合作关系请求",
-				"[" + adp.getSupplier() + "]的[" + adp.getAuditor() + "]拒绝了[" + adp.getApplicant() + "]的请求");
-		return addPartnerDao.save(adp);
-	}
-
 	@Override
 	public AddPartner reapply(Long id) {
 		AddPartner adp = addPartnerDao.findOne(id);
@@ -128,12 +56,6 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 		return addPartnerDao.save(adp);
 	}
 
-	@Override
-	public Object getMyMessageTodoCount() {
-		return addPartnerDao.getTodoCountBySupplieruuAndApplyStatuscode(SystemSession.getUser().getEnterprise().getUu(),
-				Status.NOT_REPLY.value());
-	}
-
 	@Override
 	public ModelMap addSupplier(String businessCode) {
 		Enterprise vendEnter = enterpriseDao.findEnterpriseByEnBussinessCode(businessCode);
@@ -281,7 +203,7 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 	}
 
 	/**
-	 *  ERP企业圈获取全部合作伙伴
+	 * 获取全部合作伙伴
 	 * @param keyword
 	 * @param statusCode
 	 * @param pageSize
@@ -290,121 +212,24 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 	 * @throws Exception
 	 */
 	@Override
-	public Page<BasePartnersInfo> findByBusCodeAndKeyWordForERP(String keyword, Integer statusCode, int pageSize,
-			int pageNumber) throws Exception {
-	    // 供应商或客户存在一个即过滤
-		String businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
-		Page<PartnershipRecordView> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
+	public Page<BasePartnersInfo> findByBusCodeAndKeyWord(String keyword, Integer statusCode, int pageSize,
+														   int pageNumber) throws Exception {
+		Enterprise currentSpace = SystemSession.getUser().getEnterprise();
+		Page<PartnershipRecordView> pageRecords = AccountUtils.getAllRequest(currentSpace.getEnBussinessCode(), statusCode, keyword, pageNumber,
 				pageSize);
 		Page<BasePartnersInfo> partnerRecords = new Page<>();
-		List<PartnershipRecordView> records = pageRecords != null ? pageRecords.getContent() : null;
 		List<BasePartnersInfo> baseInfos = new ArrayList<>();
-		if (!CollectionUtils.isEmpty(records)) {
-			for (PartnershipRecordView record : records) {
+		if (!CollectionUtils.isEmpty(pageRecords.getContent())) {
+			for (PartnershipRecordView record : pageRecords.getContent()) {
 				BasePartnersInfo partner = new BasePartnersInfo();
-				List<Vendor> vendor;
-				List<Vendor> customer;
 				// cust为当前企业,发出申请
-				if (record.getCustUID().equals(businessCode)) {
-					partner.setRequestDate(record.getRequestDate());
-					partner.setAppId(record.getAppId());
-					partner.setId(record.getId());
-					partner.setOperateDate(record.getOperateDate());
-					partner.setVendName(record.getVendName());
-					partner.setVendUID(record.getVendUID());
-					partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
-					partner.setVendUserName(record.getVendUserName());
-					partner.setVendUserTel(record.getVendUserTel());
-					partner.setMethod(Constant.YES);
-					partner.setNeedAgreed(Constant.NO);
-					if (record.getStatusCode() == 311) {
-						partner.setIsTodo(Constant.YES);
-					} else {
-						partner.setIsTodo(Constant.NO);
-					}
-					partner.setStatusCode(record.getStatusCode());
-					partner.setCustUserName(record.getCustUserName());
-					partner.setCustUserTel(record.getCustUserTel());
-					partner.setReason(record.getReason());
-					// 供应商
-					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getVendUID());
-					if (!CollectionUtils.isEmpty(vendor)) {
-						// 开关为null时，表示未添加，为0表示关闭，为1表示开启
-						partner.setVendor((short) (vendor.get(0).getVendswitch() == null ? 0 : 1));
-						partner.setVendorId(vendor.get(0).getId());
-						partner.setVendswitch(vendor.get(0).getVendswitch());
-						partner.setServicer((short) (vendor.get(0).getServicerswitch() == null ? 0 : 1));
-						partner.setServicerswitch(vendor.get(0).getServicerswitch());
-					} else {
-						partner.setVendor(Constant.NO);
-						partner.setServicer(Constant.NO);
-					}
-					// 客户
-					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getVendUID(), businessCode);
-					if (!CollectionUtils.isEmpty(customer)) {
-						partner.setCustomer(Constant.YES);
-						partner.setCustId(customer.get(0).getId());
-						partner.setCustswitch(customer.get(0).getCustswitch());
-					} else {
-						partner.setCustomer(Constant.NO);
-					}
-					Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(record.getVendUID());
-					partner.setEnterprise(enterprise);
-					if (null != enterprise && null != enterprise.getEnAdminuu()) {
-						UserBaseInfo admin = userBaseInfoDao.findOne(enterprise.getEnAdminuu());
-						partner.setContact(admin);
-					}
+				if (record.getCustUID().equals(currentSpace.getEnBussinessCode()) || Objects.equals(record.getCustSpaceUU(), currentSpace.getUu())) {
+					partner = sendRequest(partner, record, currentSpace);
 					baseInfos.add(partner);
 				}
 				// vend为当前企业,收到申请
-				if (record.getVendUID().equals(businessCode)) {
-					partner.setRequestDate(record.getRequestDate());
-					partner.setAppId(record.getAppId());
-					partner.setOperateDate(record.getOperateDate());
-					partner.setId(record.getId());
-					partner.setVendName(record.getCustName());
-					partner.setVendUID(record.getCustUID());
-					partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
-					partner.setVendUserName(record.getVendUserName());
-					partner.setVendUserTel(record.getVendUserTel());
-					partner.setMethod(Constant.NO);
-					partner.setStatusCode(record.getStatusCode());
-					if (record.getStatusCode() == 311) {
-						partner.setIsTodo(Constant.YES);
-						partner.setNeedAgreed(Constant.YES);
-					} else {
-						partner.setIsTodo(Constant.NO);
-						partner.setNeedAgreed(Constant.NO);
-					}
-					partner.setCustUserName(record.getCustUserName());
-					partner.setCustUserTel(record.getCustUserTel());
-					partner.setReason(record.getReason());
-					// 供应商
-					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getCustUID());
-					if (!CollectionUtils.isEmpty(vendor)) {
-						partner.setVendor((short) (vendor.get(0).getVendswitch() == null ? 0 : 1));
-						partner.setVendorId(vendor.get(0).getId());
-						partner.setVendswitch(vendor.get(0).getVendswitch());
-						partner.setServicerswitch(vendor.get(0).getServicerswitch());
-						partner.setServicer((short) (vendor.get(0).getServicerswitch() == null ? 0 : 1));
-					} else {
-						partner.setVendor(Constant.NO);
-					}
-					// 客户
-					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getCustUID(), businessCode);
-					if (!CollectionUtils.isEmpty(customer)) {
-						partner.setCustomer(Constant.YES);
-						partner.setCustId(customer.get(0).getId());
-						partner.setCustswitch(customer.get(0).getCustswitch());
-					} else {
-						partner.setCustomer(Constant.NO);
-					}
-					Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(record.getCustUID());
-					partner.setEnterprise(enterprise);
-					if (null != enterprise && null != enterprise.getEnAdminuu()) {
-						UserBaseInfo admin = userBaseInfoDao.findOne(enterprise.getEnAdminuu());
-						partner.setContact(admin);
-					}
+				if (record.getVendUID().equals(currentSpace.getEnBussinessCode()) || Objects.equals(record.getVendSpaceUU(), currentSpace.getUu())) {
+                    partner = receiveRequest(partner, record, currentSpace);
 					baseInfos.add(partner);
 				}
 			}
@@ -414,137 +239,123 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 		return partnerRecords;
 	}
 
-	/**
-	 * 获取全部合作伙伴
-	 * @param keyword
-	 * @param statusCode
-	 * @param pageSize
-	 * @param pageNumber
-	 * @return
-	 * @throws Exception
-	 */
-	@Override
-	public SPage<BasePartnersInfo> findByBusCodeAndKeyWord(String keyword, Integer statusCode, int pageSize,
-														   int pageNumber) throws Exception {
-		String businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
-		Page<PartnershipRecordView> pageRecords = AccountUtils.getAllRequest(businessCode, statusCode, keyword, pageNumber,
-				pageSize);
-		SPage<BasePartnersInfo> partnerRecords = new SPage<>();
-		List<PartnershipRecordView> records = pageRecords != null ? pageRecords.getContent() : null;
-		List<BasePartnersInfo> baseInfos = new ArrayList<>();
-		if (!CollectionUtils.isEmpty(records)) {
-			for (PartnershipRecordView record : records) {
-				BasePartnersInfo partner = new BasePartnersInfo();
-				List<Vendor> vendor;
-				List<Vendor> customer;
-				// cust为当前企业,发出申请
-				if (record.getCustUID().equals(businessCode)) {
-					partner.setRequestDate(record.getRequestDate());
-					partner.setAppId(record.getAppId());
-					partner.setId(record.getId());
-					partner.setOperateDate(record.getOperateDate());
-					partner.setVendName(record.getVendName());
-					partner.setVendUID(record.getVendUID());
-					partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
-					partner.setVendUserName(record.getVendUserName());
-					partner.setVendUserTel(record.getVendUserTel());
-					partner.setMethod(Constant.YES);
-					partner.setNeedAgreed(Constant.NO);
-					if (record.getStatusCode() == 311) {
-						partner.setIsTodo(Constant.YES);
-					} else {
-						partner.setIsTodo(Constant.NO);
-					}
-					partner.setStatusCode(record.getStatusCode());
-					partner.setCustUserName(record.getCustUserName());
-					partner.setCustUserTel(record.getCustUserTel());
-					partner.setReason(record.getReason());
-					// 供应商
-					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getVendUID());
-					if (!CollectionUtils.isEmpty(vendor)) {
-						// 开关为null时，表示未添加，为0表示关闭，为1表示开启
-						partner.setVendor((short) (vendor.get(0).getVendswitch() == null ? 0 : 1));
-						partner.setVendorId(vendor.get(0).getId());
-						partner.setVendswitch(vendor.get(0).getVendswitch());
-						partner.setServicer((short) (vendor.get(0).getServicerswitch() == null ? 0 : 1));
-						partner.setServicerswitch(vendor.get(0).getServicerswitch());
-					} else {
-						partner.setVendor(Constant.NO);
-						partner.setServicer(Constant.NO);
-					}
-					// 客户
-					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getVendUID(), businessCode);
-					if (!CollectionUtils.isEmpty(customer)) {
-						partner.setCustomer(Constant.YES);
-						partner.setCustId(customer.get(0).getId());
-						partner.setCustswitch(customer.get(0).getCustswitch());
-					} else {
-						partner.setCustomer(Constant.NO);
-					}
-                    Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(record.getVendUID());
-                    partner.setEnterprise(enterprise);
-                    if (null != enterprise && null != enterprise.getEnAdminuu()) {
-                        UserBaseInfo admin = userBaseInfoDao.findOne(enterprise.getEnAdminuu());
-                        partner.setContact(admin);
-                    }
-					baseInfos.add(partner);
-				}
-				// vend为当前企业,收到申请
-				if (record.getVendUID().equals(businessCode)) {
-					partner.setRequestDate(record.getRequestDate());
-					partner.setAppId(record.getAppId());
-					partner.setOperateDate(record.getOperateDate());
-					partner.setId(record.getId());
-					partner.setVendName(record.getCustName());
-					partner.setVendUID(record.getCustUID());
-					partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
-					partner.setVendUserName(record.getVendUserName());
-					partner.setVendUserTel(record.getVendUserTel());
-					partner.setMethod(Constant.NO);
-					partner.setStatusCode(record.getStatusCode());
-					if (record.getStatusCode() == 311) {
-						partner.setIsTodo(Constant.YES);
-						partner.setNeedAgreed(Constant.YES);
-					} else {
-						partner.setIsTodo(Constant.NO);
-						partner.setNeedAgreed(Constant.NO);
-					}
-					partner.setCustUserName(record.getCustUserName());
-					partner.setCustUserTel(record.getCustUserTel());
-					partner.setReason(record.getReason());
-					// 供应商
-					vendor = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(businessCode, record.getCustUID());
-					if (!CollectionUtils.isEmpty(vendor)) {
-						partner.setVendor((short) (vendor.get(0).getVendswitch() == null ? 0 : 1));
-						partner.setVendorId(vendor.get(0).getId());
-						partner.setVendswitch(vendor.get(0).getVendswitch());
-						partner.setServicerswitch(vendor.get(0).getServicerswitch());
-						partner.setServicer((short) (vendor.get(0).getServicerswitch() == null ? 0 : 1));
-					} else {
-						partner.setVendor(Constant.NO);
-					}
-					// 客户
-					customer = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getCustUID(), businessCode);
-					if (!CollectionUtils.isEmpty(customer)) {
-						partner.setCustomer(Constant.YES);
-						partner.setCustId(customer.get(0).getId());
-						partner.setCustswitch(customer.get(0).getCustswitch());
-					} else {
-						partner.setCustomer(Constant.NO);
-					}
-                    Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(record.getCustUID());
-                    partner.setEnterprise(enterprise);
-                    if (null != enterprise && null != enterprise.getEnAdminuu()) {
-                        UserBaseInfo admin = userBaseInfoDao.findOne(enterprise.getEnAdminuu());
-                        partner.setContact(admin);
-                    }
-					baseInfos.add(partner);
-				}
-			}
+    /**
+     * 当前企业作为被邀请方数据处理
+     *
+     * @param partner 合作关系
+     * @param record 邀请记录
+     * @param currentSpace 当前企业
+     * @return
+     */
+    private BasePartnersInfo receiveRequest(BasePartnersInfo partner, PartnershipRecordView record, Enterprise currentSpace) {
+        partner.setRequestDate(record.getRequestDate());
+        partner.setAppId(record.getAppId());
+        partner.setOperateDate(record.getOperateDate());
+        partner.setId(record.getId());
+        partner.setVendName(record.getCustName());
+        partner.setVendUID(record.getCustUID());
+        partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
+        partner.setVendUserName(record.getVendUserName());
+        partner.setVendUserTel(record.getVendUserTel());
+        partner.setMethod(Constant.NO);
+        partner.setStatusCode(record.getStatusCode());
+        if (record.getStatusCode() == Status.UNAUDIT.value()) {
+            partner.setIsTodo(Constant.YES);
+            partner.setNeedAgreed(Constant.YES);
+        } else {
+            partner.setIsTodo(Constant.NO);
+            partner.setNeedAgreed(Constant.NO);
+        }
+        partner.setCustUserName(record.getCustUserName());
+        partner.setCustUserTel(record.getCustUserTel());
+        partner.setReason(record.getReason());
+        // 供应商
+        List<Vendor> vendors = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(currentSpace.getEnBussinessCode(), record.getCustUID());
+        if (!CollectionUtils.isEmpty(vendors)) {
+            partner.setVendor((short) (vendors.get(0).getVendswitch() == null ? 0 : 1));
+            partner.setVendorId(vendors.get(0).getId());
+            partner.setVendswitch(vendors.get(0).getVendswitch());
+            partner.setServicerswitch(vendors.get(0).getServicerswitch());
+            partner.setServicer((short) (vendors.get(0).getServicerswitch() == null ? 0 : 1));
+        } else {
+            partner.setVendor(Constant.NO);
+        }
+        // 客户
+        List<Vendor> customers = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getCustUID(), currentSpace.getEnBussinessCode());
+        if (!CollectionUtils.isEmpty(customers)) {
+            partner.setCustomer(Constant.YES);
+            partner.setCustId(customers.get(0).getId());
+            partner.setCustswitch(customers.get(0).getCustswitch());
+        } else {
+            partner.setCustomer(Constant.NO);
+        }
+        Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(record.getCustUID());
+        partner.setEnterprise(enterprise);
+        if (null != enterprise && null != enterprise.getEnAdminuu()) {
+            UserBaseInfo admin = userBaseInfoDao.findOne(enterprise.getEnAdminuu());
+            partner.setContact(admin);
+        }
+        return partner;
+    }
+
+    /**
+     * 当前企业作为邀请方处理数据
+     *
+     * @param partner 合作关系
+     * @param record 邀请记录
+     * @param currentSpace 当前企业
+     * @return
+     */
+	private BasePartnersInfo sendRequest(BasePartnersInfo partner, PartnershipRecordView record, Enterprise currentSpace) {
+		partner.setRequestDate(record.getRequestDate());
+		partner.setAppId(record.getAppId());
+		partner.setId(record.getId());
+		partner.setOperateDate(record.getOperateDate());
+		partner.setVendName(record.getVendName());
+		partner.setVendUID(record.getVendUID());
+		partner.setVendUserCode(String.valueOf(record.getVendUserCode()));
+		partner.setVendUserName(record.getVendUserName());
+		partner.setVendUserTel(record.getVendUserTel());
+		partner.setMethod(Constant.YES);
+		partner.setNeedAgreed(Constant.NO);
+		if (record.getStatusCode() == Status.UNAUDIT.value()) {
+			partner.setIsTodo(Constant.YES);
+		} else {
+			partner.setIsTodo(Constant.NO);
 		}
-		partnerRecords.setContent(baseInfos);
-		partnerRecords.setTotalElement(pageRecords != null ? pageRecords.getTotalElements() : 0);
-		return partnerRecords;
+		partner.setStatusCode(record.getStatusCode());
+		partner.setCustUserName(record.getCustUserName());
+		partner.setCustUserTel(record.getCustUserTel());
+		partner.setReason(record.getReason());
+		// 供应商
+		List<Vendor> vendors = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(currentSpace.getEnBussinessCode(), record.getVendUID());
+		if (!CollectionUtils.isEmpty(vendors)) {
+			// 开关为null时，表示未添加，为0表示关闭，为1表示开启
+			partner.setVendor((short) (vendors.get(0).getVendswitch() == null ? 0 : 1));
+			partner.setVendorId(vendors.get(0).getId());
+			partner.setVendswitch(vendors.get(0).getVendswitch());
+			partner.setServicer((short) (vendors.get(0).getServicerswitch() == null ? 0 : 1));
+			partner.setServicerswitch(vendors.get(0).getServicerswitch());
+		} else {
+			partner.setVendor(Constant.NO);
+			partner.setServicer(Constant.NO);
+		}
+		// 客户
+		List<Vendor> customers = vendorDao.findByMyEnBusinessCodeAndVendBusinessCode(record.getVendUID(), currentSpace.getEnBussinessCode());
+		if (!CollectionUtils.isEmpty(customers)) {
+			partner.setCustomer(Constant.YES);
+			partner.setCustId(customers.get(0).getId());
+			partner.setCustswitch(customers.get(0).getCustswitch());
+		} else {
+			partner.setCustomer(Constant.NO);
+		}
+		Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(record.getVendUID());
+		partner.setEnterprise(enterprise);
+		if (null != enterprise && null != enterprise.getEnAdminuu()) {
+			UserBaseInfo admin = userBaseInfoDao.findOne(enterprise.getEnAdminuu());
+			partner.setContact(admin);
+		}
+		return partner;
 	}
 
 	@Override