|
|
@@ -168,9 +168,19 @@ public class FsStoreOrderScrmController extends BaseController
|
|
|
@GetMapping("/list")
|
|
|
public TableDataInfo list(FsStoreOrderParam fsStoreOrder)
|
|
|
{
|
|
|
+ startPage();
|
|
|
fsStoreOrder.setStoreId(UserUtil.getLoginUserStoreID());
|
|
|
List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(fsStoreOrder);
|
|
|
- return getDataTable(list);
|
|
|
+ FsStoreOrderParam param = new FsStoreOrderParam();
|
|
|
+ param.setStoreId(UserUtil.getLoginUserStoreID());
|
|
|
+ Integer num = 0;
|
|
|
+ if(!list.isEmpty()){
|
|
|
+ List<FsStoreOrderVO> countList = fsStoreOrderService.selectFsStoreOrderListVO(fsStoreOrder);
|
|
|
+ num = countList.size();
|
|
|
+ }
|
|
|
+ TableDataInfo dataInfo = getDataTable(list);
|
|
|
+ dataInfo.setTotal(num);
|
|
|
+ return dataInfo;
|
|
|
}
|
|
|
|
|
|
/**
|