From 6cca89c41aea52ae6b23909bb9fbd2834f0094d5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 08 六月 2023 18:43:12 +0800
Subject: [PATCH] 基础配置

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 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..4cc9131 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,18 +3,17 @@
 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;
-import com.ruoyi.system.api.domain.dto.MgtPageDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -30,18 +29,18 @@
 public class MgtMemberController {
 
 
-    @Autowired
+    @Resource
     private MemberTaskRecordService memberTaskRecordService;
 
     @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