From f37052eabfc9243e2004e7f2d0495f3b838225ad Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 11 Oct 2024 18:33:06 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/controller/AgentApiController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/controller/AgentApiController.java b/src/main/java/com/nq/controller/AgentApiController.java
index 2fc8c16..af776c8 100644
--- a/src/main/java/com/nq/controller/AgentApiController.java
+++ b/src/main/java/com/nq/controller/AgentApiController.java
@@ -7,6 +7,7 @@
 import com.nq.pojo.UserStockSubscribe;
 import com.nq.service.IAgentUserService;
 
+import com.nq.service.IUserPositionService;
 import com.nq.service.IUserStockSubscribeService;
 import com.nq.utils.PropertiesUtil;
 
@@ -52,6 +53,9 @@
     @Autowired
     IUserStockSubscribeService iUserStockSubscribeService;
 
+    @Autowired
+    IUserPositionService iUserPositionService;
+
     //代理后台登录
     @RequestMapping({"login.do"})
     @ResponseBody
@@ -88,6 +92,8 @@
                                                 @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
                                                 @RequestParam(value = "keyword", defaultValue = "") String keyword,
                                                 @RequestParam(value = "agentId", required = false) String agentId,
+                                                @RequestParam(value = "name", required = false) String name,
+                                                @RequestParam(value = "status", required = false) Integer status,
                                                 HttpServletRequest request) {
         String loginToken = CookieUtils.readLoginToken(request, PropertiesUtil.getProperty("agent.cookie.name"));
         String agentJson = RedisShardedPoolUtils.get(loginToken);
@@ -95,7 +101,7 @@
         if (agentUser ==null){
             return   ServerResponse.createByError("請先登錄",null);
         }
-        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentUser.getId().toString(), request);
+        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentUser.getId().toString(),name,status, request);
     }
 
     //申购信息-添加 修改
@@ -111,5 +117,4 @@
     public ServerResponse delStockSubscribe(@RequestParam("id") int id, HttpServletRequest request) {
         return this.iUserStockSubscribeService.del(id, request);
     }
-
 }

--
Gitblit v1.9.3