判断从企业库取得的企业资料营业执照号是否为空

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

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

@@ -423,47 +423,52 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				params.getPage(), params.getCount());
 		SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
 		List<UserSpaceDetail> spaceDetails = new ArrayList<UserSpaceDetail>();
-		for (com.uas.account.entity.UserSpaceDetail detail : details.getContent()) {
-			UserSpaceDetail spacetDetail = new UserSpaceDetail();
-			spacetDetail.setAddress(detail.getAddress());
-			spacetDetail.setAdminEmail(detail.getAdminEmail());
-			spacetDetail.setAdminName(detail.getAdminName());
-			spacetDetail.setAdminTel(detail.getAdminTel());
-			spacetDetail.setApplyApps(detail.getApplyApps());
-			spacetDetail.setApproveStatus(detail.getApproveStatus());
-			spacetDetail.setArea(detail.getArea());
-			spacetDetail.setBusinessCode(detail.getBusinessCode());
-			spacetDetail.setBusinessCodeImage(detail.getBusinessCodeImage());
-			spacetDetail.setCity(detail.getCity());
-			spacetDetail.setCorporation(detail.getCorporation());
-			spacetDetail.setDistrict(detail.getDistrict());
-			spacetDetail.setErrMsg(detail.getErrMsg());
-			spacetDetail.setFax(detail.getFax());
-			spacetDetail.setId(detail.getId());
-			spacetDetail.setIndustry(detail.getIndustry());
-			spacetDetail.setLogoImage(detail.getLogoImage());
-			spacetDetail.setName(detail.getName());
-			spacetDetail.setProvince(detail.getProvince());
-			spacetDetail.setRegisterDate(detail.getRegisterDate());
-			spacetDetail.setShortName(detail.getShortName());
-			spacetDetail.setStatus(detail.getStatus());
-			spacetDetail.setStreet(detail.getStreet());
-			spacetDetail.setTel(detail.getTel());
-			spacetDetail.setType(detail.getType());
-			spacetDetail.setUrl(detail.getUrl());
-			RequsetStatus request = AccountUtils.getStatusByCustUidAndVendUid(spacetDetail.getBusinessCode(),
-					SystemSession.getUser().getEnterprise().getEnBussinessCode());
-			if (request != null) {
-				spacetDetail.setRequestStatus(request.getStatusCode());
-				spacetDetail.setMethod(request.getMethod());
-			}
-			if (spacetDetail.getBusinessCode().equals(SystemSession.getUser().getEnterprise().getEnBussinessCode())) {
-				spacetDetail.setCurrent(Constant.YES);
+		if (!CollectionUtils.isEmpty(details.getContent())) {
+			for (com.uas.account.entity.UserSpaceDetail detail : details.getContent()) {
+				UserSpaceDetail spacetDetail = new UserSpaceDetail();
+				spacetDetail.setAddress(detail.getAddress());
+				spacetDetail.setAdminEmail(detail.getAdminEmail());
+				spacetDetail.setAdminName(detail.getAdminName());
+				spacetDetail.setAdminTel(detail.getAdminTel());
+				spacetDetail.setApplyApps(detail.getApplyApps());
+				spacetDetail.setApproveStatus(detail.getApproveStatus());
+				spacetDetail.setArea(detail.getArea());
+				spacetDetail.setBusinessCode(detail.getBusinessCode());
+				spacetDetail.setBusinessCodeImage(detail.getBusinessCodeImage());
+				spacetDetail.setCity(detail.getCity());
+				spacetDetail.setCorporation(detail.getCorporation());
+				spacetDetail.setDistrict(detail.getDistrict());
+				spacetDetail.setErrMsg(detail.getErrMsg());
+				spacetDetail.setFax(detail.getFax());
+				spacetDetail.setId(detail.getId());
+				spacetDetail.setIndustry(detail.getIndustry());
+				spacetDetail.setLogoImage(detail.getLogoImage());
+				spacetDetail.setName(detail.getName());
+				spacetDetail.setProvince(detail.getProvince());
+				spacetDetail.setRegisterDate(detail.getRegisterDate());
+				spacetDetail.setShortName(detail.getShortName());
+				spacetDetail.setStatus(detail.getStatus());
+				spacetDetail.setStreet(detail.getStreet());
+				spacetDetail.setTel(detail.getTel());
+				spacetDetail.setType(detail.getType());
+				spacetDetail.setUrl(detail.getUrl());
+				RequsetStatus request = AccountUtils.getStatusByCustUidAndVendUid(spacetDetail.getBusinessCode(),
+						SystemSession.getUser().getEnterprise().getEnBussinessCode());
+				if (request != null) {
+					spacetDetail.setRequestStatus(request.getStatusCode());
+					spacetDetail.setMethod(request.getMethod());
+				}
+				if (spacetDetail.getBusinessCode() != null) {
+					if (spacetDetail.getBusinessCode()
+						.equals(SystemSession.getUser().getEnterprise().getEnBussinessCode())) {
+					spacetDetail.setCurrent(Constant.YES);
+					}
+				}
+				spaceDetails.add(spacetDetail);
 			}
-			spaceDetails.add(spacetDetail);
+			userSpaceDetails.setContent(spaceDetails);
+			userSpaceDetails.setTotalElement(details.getTotalElements());
 		}
-		userSpaceDetails.setContent(spaceDetails);
-		userSpaceDetails.setTotalElement(details.getTotalElements());
 		return userSpaceDetails;
 	}