From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
index 247bb5b..300b143 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo;
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.system.api.domain.dto.MgtBaseDto;
@@ -35,13 +36,13 @@
@RequestMapping(value = "/pageMgtMemberFollow", method = RequestMethod.POST)
@ApiOperation(value = "平台获取用户跟进列表")
- public R<Page<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtPageDto mgtPageDto) {
+ public R<Page<MgtMemberFollowPageVo>> pageMgtMemberFollow(@RequestBody MgtMemberTaskPageDto mgtMemberTaskPageDto) {
Long userId = SecurityUtils.getUserId();
- mgtPageDto.setUserId(userId);
+ mgtMemberTaskPageDto.setUserId(userId);
Page<MgtMemberFollowPageVo> page = new Page<>();
- page.setSize(mgtPageDto.getPageSize());
- page.setCurrent(mgtPageDto.getPageNum());
- List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(page);
+ page.setSize(mgtMemberTaskPageDto.getPageSize());
+ page.setCurrent(mgtMemberTaskPageDto.getPageNum());
+ List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordService.pageMgtMemberFollow(page, mgtMemberTaskPageDto);
return R.ok(page.setRecords(mgtMemberFollowPageVoList));
}
}
--
Gitblit v1.7.1