根据产品需求，新的合作伙伴列表取已注册优软云的企业信息

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

@@ -481,7 +481,37 @@ public class BaseInfoController {
 	@ResponseBody
 	public SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword)
 			throws Exception {
-		return baseInfoService.getUserSpaceDetails(params, keyword);
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("searchstatus", Constant.YES);
+		// 排序条件
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
+	}
+
+	/**
+	 * 顶部通过关键词查询账户中心的相关的企业信息
+	 *
+	 * @param keyword
+	 * @param params
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/getUserSpaceDetails/done", method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<UserSpaceDetail> getUserSpaceDetailsDone(PageParams params, String keyword)
+			throws Exception {
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("searchstatus", Constant.YES);
+		pageParams.getFilters().put("status", Status.ENABLED.value());
+		// 排序条件
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}
 	
 	/**

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

@@ -98,7 +98,7 @@ public interface BaseInfoService {
 	 * @return
 	 * @throws Exception
 	 */
-	SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword) throws Exception;
+	SPage<UserSpaceDetail> getUserSpaceDetails(com.uas.search.b2b.model.PageParams params, String keyword) throws Exception;
 
 	/**
 	 * 通过id获取附件信息

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

@@ -557,16 +557,8 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	}
 
 	@Override
-	public SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword) throws Exception {
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-		pageParams.getFilters().put("searchstatus", Constant.YES);
-		// 排序条件
-		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		SPage<com.uas.account.entity.UserSpaceDetail> details = searchService.searchUserSpaceDetailCheckIds(keyword,
-				pageParams);
+	public SPage<UserSpaceDetail> getUserSpaceDetails(com.uas.search.b2b.model.PageParams params, String keyword) throws Exception {
+		SPage<com.uas.account.entity.UserSpaceDetail> details = searchService.searchUserSpaceDetailCheckIds(keyword, params);
 		SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
 		List<UserSpaceDetail> spaceDetails = new ArrayList<UserSpaceDetail>();
 		if (!CollectionUtils.isEmpty(details.getContent())) {

src/main/webapp/resources/js/index/app.js

@@ -595,6 +595,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             controller: 'AddPartnersCtrl'
         }).state('baseInfo.partner_searchresult', {
             url: '/search',
+            params: {
+                'active': 'done'
+            },
             templateUrl: "static/tpl/index/baseInfo/searchresult.html",
             controller: 'EnterpriseSearchCtrl'
         }).state('baseInfo.invitation', {
@@ -14774,8 +14777,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }, function (response) {
 
             });
-        }
-        ;
+        };
 
         // 查找供应商
         $scope.dbfindVend = function () {
@@ -20974,10 +20976,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     }]);
 
     // 企业圈搜索结果
-    app.controller('EnterpriseSearchCtrl', ['$scope', 'getAccountUserSpace', 'ngTableParams', '$filter', 'BaseService', 'toaster', 'AddPartner', '$rootScope', '$modal', 'InvitationRecord', function ($scope, getAccountUserSpace, ngTableParams, $filter, BaseService, toaster, AddPartner, $rootScope, $modal, InvitationRecord) {
+    app.controller('EnterpriseSearchCtrl', ['$scope', 'getAccountUserSpace', 'ngTableParams', '$filter', 'BaseService', 'toaster', 'AddPartner', '$rootScope', '$modal', 'InvitationRecord', '$stateParams', function ($scope, getAccountUserSpace, ngTableParams, $filter, BaseService, toaster, AddPartner, $rootScope, $modal, InvitationRecord, $stateParams) {
         $scope.status = 'add';
         BaseService.scrollBackToTop();
-        $scope.active = 'all';
+        if ($stateParams.active != null) {
+            $scope.active = $stateParams.active;
+        } else {
+            $scope.active = 'all';
+        }
         $scope.agreedText = '全部';
         $scope.dateZoneText = '一个月内';
         $scope.condition = {dateZone: 1};

src/main/webapp/resources/js/index/services/BaseInfo.js

@@ -299,7 +299,11 @@ define(['ngResource'], function() {
 		return $resource('product/baseInfo/getUserSpaceDetails', {}, {
 			getAll: {
 				isArray: false
-			}
+			},
+            getDone: {
+                url: 'product/baseInfo/getUserSpaceDetails/done',
+                method: 'GET'
+            },
 		})
 	}]).factory('AddPartner', ['$resource', function($resource) {
 		return $resource('addpartner', {}, {