|
@@ -21,8 +21,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
|
|
-import com.uas.account.entity.UserSpaceDetail;
|
|
|
|
|
-import com.uas.account.support.Page;
|
|
|
|
|
import com.uas.account.util.AccountUtils;
|
|
import com.uas.account.util.AccountUtils;
|
|
|
import com.uas.platform.b2b.model.Enterprise;
|
|
import com.uas.platform.b2b.model.Enterprise;
|
|
|
import com.uas.platform.b2b.model.FileUpload;
|
|
import com.uas.platform.b2b.model.FileUpload;
|
|
@@ -37,6 +35,7 @@ import com.uas.platform.b2b.support.SystemSession;
|
|
|
import com.uas.platform.b2b.support.UsageBufferedLogger;
|
|
import com.uas.platform.b2b.support.UsageBufferedLogger;
|
|
|
import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
|
|
import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
|
|
|
import com.uas.platform.b2b.temporary.model.NewPurcOrder;
|
|
import com.uas.platform.b2b.temporary.model.NewPurcOrder;
|
|
|
|
|
+import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
import com.uas.platform.core.logging.BufferedLoggerManager;
|
|
import com.uas.platform.core.logging.BufferedLoggerManager;
|
|
|
import com.uas.platform.core.model.PageInfo;
|
|
import com.uas.platform.core.model.PageInfo;
|
|
@@ -287,11 +286,6 @@ public class BaseInfoController {
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword)
|
|
public SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword)
|
|
|
throws Exception {
|
|
throws Exception {
|
|
|
- Page<UserSpaceDetail> details = AccountUtils.getUserSpacesByKeyword(keyword, params.getPage(),
|
|
|
|
|
- params.getCount());
|
|
|
|
|
- SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
|
|
|
|
|
- userSpaceDetails.setContent(details.getContent());
|
|
|
|
|
- userSpaceDetails.setTotalElement(details.getTotalElements());
|
|
|
|
|
- return userSpaceDetails;
|
|
|
|
|
|
|
+ return baseInfoService.getUserSpaceDetails(params, keyword);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|