企业圈搜索结果显示修改

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

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

@@ -450,8 +450,6 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 						partner.setVendor((short) (vendor.get(0).getVendswitch() == null ? 0 : 1));
 						partner.setVendorId(vendor.get(0).getId());
 						partner.setVendswitch(vendor.get(0).getVendswitch());
-						partner.setEnterprise(vendor.get(0).getVendorEnterprise());
-						partner.setContact(vendor.get(0).getMyUser());
 						partner.setServicer((short) (vendor.get(0).getServicerswitch() == null ? 0 : 1));
 						partner.setServicerswitch(vendor.get(0).getServicerswitch());
 					} else {
@@ -464,19 +462,15 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 						partner.setCustomer(Constant.YES);
 						partner.setCustId(customer.get(0).getId());
 						partner.setCustswitch(customer.get(0).getCustswitch());
-						partner.setEnterprise(customer.get(0).getMyEnterprise());
-						partner.setContact(customer.get(0).getVendorUser());
 					} else {
 						partner.setCustomer(Constant.NO);
 					}
-					if (null == partner.getEnterprise()) {
-						Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(record.getVendUID());
-						partner.setEnterprise(enterprise);
-						if (null != enterprise && null != enterprise.getEnAdminuu()) {
-							UserBaseInfo admin = userBaseInfoDao.findOne(enterprise.getEnAdminuu());
-							partner.setContact(admin);
-						}
-					}
+                    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为当前企业,收到申请
@@ -510,8 +504,6 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 						partner.setVendswitch(vendor.get(0).getVendswitch());
 						partner.setServicerswitch(vendor.get(0).getServicerswitch());
 						partner.setServicer((short) (vendor.get(0).getServicerswitch() == null ? 0 : 1));
-						partner.setEnterprise(vendor.get(0).getVendorEnterprise());
-						partner.setContact(vendor.get(0).getMyUser());
 					} else {
 						partner.setVendor(Constant.NO);
 					}
@@ -521,19 +513,15 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 						partner.setCustomer(Constant.YES);
 						partner.setCustId(customer.get(0).getId());
 						partner.setCustswitch(customer.get(0).getCustswitch());
-						partner.setEnterprise(customer.get(0).getMyEnterprise());
-						partner.setContact(customer.get(0).getMyUser());
 					} else {
 						partner.setCustomer(Constant.NO);
 					}
-					if (null == partner.getEnterprise()) {
-						Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(record.getCustUID());
-						partner.setEnterprise(enterprise);
-						if (null != enterprise && null != enterprise.getEnAdminuu()) {
-							UserBaseInfo admin = userBaseInfoDao.findOne(enterprise.getEnAdminuu());
-							partner.setContact(admin);
-						}
-					}
+                    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);
 				}
 			}