顶部搜索企业列表页面状态展示调整

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

@@ -535,12 +535,14 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				}
                 spacetDetail.setAddress(detail.getRegAddress());
 				spacetDetail.setName(detail.getSpaceName());
-				spacetDetail.setAdminEmail(detail.getAdmin().getEmail());
-				spacetDetail.setAdminName(detail.getAdmin().getVipName());
-				spacetDetail.setAdminTel(detail.getAdmin().getMobile());
 				spacetDetail.setBusinessCode(detail.getBusinessCode());
 				spacetDetail.setBusinessCodeImage(detail.getBusinessCodeImage());
                 spaceDetails.add(spacetDetail);
+                if (null != detail.getAdmin()) {
+					spacetDetail.setAdminEmail(detail.getAdmin().getEmail());
+					spacetDetail.setAdminName(detail.getAdmin().getVipName());
+					spacetDetail.setAdminTel(detail.getAdmin().getMobile());
+				}
 			}
 			userSpaceDetails.setContent(spaceDetails);
 			userSpaceDetails.setTotalElement(details.getTotalElements());

src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -329,8 +329,8 @@
 	<tbody ng-repeat="enterprise in $data" class="company-list">
 		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
 			<td colspan="4"><span ng-bind-html="::enterprise.name| getkey:keyword" class="text-center"></span>&nbsp;<img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
-			<td width="180" class="grey01 text-center" ng-if="enterprise.status != 313">当前企业不是优软云用户</td>
-			<td width="140" class="grey01 text-center" ng-if="enterprise.status == 313">优软云用户</td>
+			<td width="180" class="grey01 text-center" ng-if="enterprise.uu == null">当前企业不是优软云用户</td>
+			<td width="140" class="grey01 text-center" ng-if="enterprise.uu != null">优软云用户</td>
 		</tr>
 		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
 			<td class="product" colspan="4">
@@ -354,8 +354,8 @@
 			</td>
 			<td width="100" class="text-center">
 				<!-- 拒绝了他人申请的企业，无法主动去添加已被拒绝的企业为合作伙伴 -->
-				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null && enterprise.status == 313">立即添加</a>
-				<a class="btn btn-primary" ng-click="invite(enterprise.name)" ng-if="(enterprise.requestStatus==null||enterprise.requestStatus==310) && enterprise.status != 313">邀请注册</a>
+				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null && enterprise.uu != null">立即添加</a>
+				<a class="btn btn-primary" ng-click="invite(enterprise.name)" ng-if="(enterprise.requestStatus==null||enterprise.requestStatus==310) && enterprise.uu == null">邀请注册</a>
 				<span class="btn01 label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
 				<p class="line24" ng-if="enterprise.requestStatus==311 && enterprise.method==0"><span class="btn btn-primary" ng-click="view(enterprise.name)">立即查看</span></p>
 				<span class="btn01 label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>