From 40a326d5f9797ff12cb9b3da7625b1d7db3cc908 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 09 Oct 2024 11:48:39 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |    8 +-------
 src/main/java/com/nq/controller/AgentApiController.java              |    9 ++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nq/controller/AgentApiController.java b/src/main/java/com/nq/controller/AgentApiController.java
index e262b1f..2fc8c16 100644
--- a/src/main/java/com/nq/controller/AgentApiController.java
+++ b/src/main/java/com/nq/controller/AgentApiController.java
@@ -3,6 +3,7 @@
 
 import com.nq.common.ServerResponse;
 
+import com.nq.pojo.AgentUser;
 import com.nq.pojo.UserStockSubscribe;
 import com.nq.service.IAgentUserService;
 
@@ -88,7 +89,13 @@
                                                 @RequestParam(value = "keyword", defaultValue = "") String keyword,
                                                 @RequestParam(value = "agentId", required = false) String agentId,
                                                 HttpServletRequest request) {
-        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId, request);
+        String loginToken = CookieUtils.readLoginToken(request, PropertiesUtil.getProperty("agent.cookie.name"));
+        String agentJson = RedisShardedPoolUtils.get(loginToken);
+        AgentUser agentUser = (AgentUser) JsonUtil.string2Obj(agentJson, AgentUser.class);
+        if (agentUser ==null){
+            return   ServerResponse.createByError("請先登錄",null);
+        }
+        return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentUser.getId().toString(), request);
     }
 
     //申购信息-添加 修改
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index e6128f1..f2b72db 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -386,14 +386,8 @@
     /*新股申购-查询列表*/
     @Override
     public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
-        String loginToken = CookieUtils.readLoginToken(request, PropertiesUtil.getProperty("agent.cookie.name"));
-        String agentJson = RedisShardedPoolUtils.get(loginToken);
-        AgentUser agentUser = (AgentUser) JsonUtil.string2Obj(agentJson, AgentUser.class);
-        if (agentUser ==null){
-            return   ServerResponse.createByError("請先登錄",null);
-        }
         PageHelper.startPage(pageNum, pageSize);
-        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentUser.getId().toString());
+        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
         PageInfo pageInfo = new PageInfo(listData);
         pageInfo.setList(listData);
         return ServerResponse.createBySuccess(pageInfo);

--
Gitblit v1.9.3