全局搜索物料时，先判断企业是否存在

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

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

@@ -861,29 +861,31 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				ProdInfo prodInfo = new ProdInfo();
 				Enterprise en = enterpriseDao.findEnterpriseByUu(product.getEnUU());
 				// 先判断合作关系
-				RequsetStatus request = AccountUtils.getStatusByCustUidAndVendUid(en.getEnBussinessCode(),
-						SystemSession.getUser().getEnterprise().getEnBussinessCode());
-				if (request != null) {
-					if (request.getStatusCode() != null) {
-						if (request.getStatusCode().equals(Status.ENABLED.value())) {// 如果是好友则继续判断是否是供应商
-							List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(
-									SystemSession.getUser().getEnterprise().getUu(), product.getEnUU());
-							if (!CollectionUtils.isEmpty(vendors)) {
-								prodInfo.setIsPartner(PartStatus.ISVENDOR.getValue());
-							} else {
-								prodInfo.setIsPartner(PartStatus.ISPARTNER.getValue());
+				if (null != en) {
+					RequsetStatus request = AccountUtils.getStatusByCustUidAndVendUid(en.getEnBussinessCode(),
+							SystemSession.getUser().getEnterprise().getEnBussinessCode());
+					if (request != null) {
+						if (request.getStatusCode() != null) {
+							if (request.getStatusCode().equals(Status.ENABLED.value())) {// 如果是好友则继续判断是否是供应商
+								List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(
+										SystemSession.getUser().getEnterprise().getUu(), product.getEnUU());
+								if (!CollectionUtils.isEmpty(vendors)) {
+									prodInfo.setIsPartner(PartStatus.ISVENDOR.getValue());
+								} else {
+									prodInfo.setIsPartner(PartStatus.ISPARTNER.getValue());
+								}
 							}
-						}
-						if (request.getStatusCode().equals(Status.UNAUDIT.value())) {// 待处理统一一个字段标识
-							prodInfo.setIsPartner(PartStatus.ISPENDING.getValue());
-						}
-						if (request.getStatusCode().equals(Status.UNAPPLY.value())) {
+							if (request.getStatusCode().equals(Status.UNAUDIT.value())) {// 待处理统一一个字段标识
+								prodInfo.setIsPartner(PartStatus.ISPENDING.getValue());
+							}
+							if (request.getStatusCode().equals(Status.UNAPPLY.value())) {
+								prodInfo.setIsPartner(PartStatus.ISNOTPARTNER.getValue());
+							}
+						} else {
 							prodInfo.setIsPartner(PartStatus.ISNOTPARTNER.getValue());
 						}
-					} else {
-						prodInfo.setIsPartner(PartStatus.ISNOTPARTNER.getValue());
-					}
 
+					}
 				}
 				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(SystemSession.getUser().getEnterprise().getUu(),
 						product.getEnUU());