From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/action/FollowuController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/FollowuController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/FollowuController.java
index 2f9f7a0..569cff6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/FollowuController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/FollowuController.java
@@ -7,9 +7,10 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.dto.FollowuListDto;
-import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@@ -17,7 +18,7 @@
/**
* @description 跟进记录
*/
-@Controller
+@RestController
@RequestMapping(value = "admin/followu")
public class FollowuController extends BaseController{
@@ -29,9 +30,10 @@
* 显示所有的会员卡等级信息
*/
@RequestMapping(value = "/showList")
- public @ResponseBody AjaxResult showList(FollowuListDto followuListDto) {
+ public AjaxResult showList(@RequestBody @Validated FollowuListDto followuListDto) {
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
followuListDto.setCompanyId(users.getCompanyId());
+ followuListDto.setSelfStaff(users.getSuId());
List<SysFollowup> list= followupService.findVipFollowuByPage(followuListDto);
return AjaxResult.buildSuccessInstance(list);
}
--
Gitblit v1.9.1