空值 返回空
This commit is contained in:
@@ -82,7 +82,7 @@ public class UPointsController {
|
|||||||
@GetMapping("/userRecord")
|
@GetMapping("/userRecord")
|
||||||
public CzgResult<Page<MkPointsUserRecord>> getPointsRecord(@RequestParam(required = false, defaultValue = "1") Integer page,
|
public CzgResult<Page<MkPointsUserRecord>> getPointsRecord(@RequestParam(required = false, defaultValue = "1") Integer page,
|
||||||
@RequestParam(required = false, defaultValue = "10") Integer size,
|
@RequestParam(required = false, defaultValue = "10") Integer size,
|
||||||
@RequestParam Long id) {
|
@RequestParam(required = false) Long id) {
|
||||||
|
|
||||||
return CzgResult.success(pointsUserRecordService.getPointsUserRecord(page, size, id));
|
return CzgResult.success(pointsUserRecordService.getPointsUserRecord(page, size, id));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,13 @@
|
|||||||
package com.czg.service.market.service.impl;
|
package com.czg.service.market.service.impl;
|
||||||
|
|
||||||
import com.czg.account.vo.PointsShopListVO;
|
import com.czg.market.entity.MkPointsUserRecord;
|
||||||
|
import com.czg.market.service.MkPointsUserRecordService;
|
||||||
|
import com.czg.service.market.mapper.MkPointsUserRecordMapper;
|
||||||
import com.czg.utils.PageUtil;
|
import com.czg.utils.PageUtil;
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.mybatisflex.core.paginate.Page;
|
import com.mybatisflex.core.paginate.Page;
|
||||||
import com.mybatisflex.core.query.QueryWrapper;
|
|
||||||
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
||||||
import com.czg.market.entity.MkPointsUserRecord;
|
|
||||||
import com.czg.market.service.MkPointsUserRecordService;
|
|
||||||
import com.czg.service.market.mapper.MkPointsUserRecordMapper;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -30,6 +28,9 @@ public class MkPointsUserRecordServiceImpl extends ServiceImpl<MkPointsUserRecor
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Page<MkPointsUserRecord> getPointsUserRecord(Integer page, Integer size, Long mkPointsUserId) {
|
public Page<MkPointsUserRecord> getPointsUserRecord(Integer page, Integer size, Long mkPointsUserId) {
|
||||||
|
if (mkPointsUserId == null) {
|
||||||
|
return new Page<>();
|
||||||
|
}
|
||||||
PageHelper.startPage(page, size);
|
PageHelper.startPage(page, size);
|
||||||
List<MkPointsUserRecord> record = mapper.getPointsUserRecord(mkPointsUserId);
|
List<MkPointsUserRecord> record = mapper.getPointsUserRecord(mkPointsUserId);
|
||||||
return PageUtil.convert(new PageInfo<>(record));
|
return PageUtil.convert(new PageInfo<>(record));
|
||||||
|
|||||||
Reference in New Issue
Block a user