|
@@ -143,10 +143,11 @@ public class MOrderServiceImpl extends ServicePlusImpl<MOrderMapper, MOrder, MOr
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<MOrderVo> getListAll(MOrderBo bo) {
|
|
|
+ public Page<MOrderVo> getListAll(MOrderBo bo) {
|
|
|
bo.setUserId(SecurityUtils.getWxLoginUser().getMUser().getId());
|
|
|
- List<MOrderVo> list = mOrderMapper.getListAll(bo);
|
|
|
- list.forEach(i -> {
|
|
|
+ Page<MOrderVo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
|
|
|
+ Page<MOrderVo> list = mOrderMapper.getListAll(bo,page);
|
|
|
+ list.getRecords().forEach(i -> {
|
|
|
if (Constants.Dict.SERVICE_TYPE001.getItemValue().equals(i.getServiceType())){
|
|
|
i.setServiceType(Constants.Dict.SERVICE_TYPE001.getItemName());
|
|
|
}
|