From 67c3bb07a48ef8e730c95a2179f3ca1321b4b11c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 12 Jan 2026 15:25:42 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockOptionServiceImpl.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockOptionServiceImpl.java b/src/main/java/com/nq/service/impl/StockOptionServiceImpl.java
index bb235a7..4f092da 100644
--- a/src/main/java/com/nq/service/impl/StockOptionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockOptionServiceImpl.java
@@ -18,6 +18,7 @@
 
 import com.nq.pojo.User;
 
+import com.nq.pojo.reponse.RPageInfo;
 import com.nq.service.IStockOptionService;
 
 import com.nq.service.IUserService;
@@ -30,6 +31,7 @@
 
 import com.nq.vo.stock.StockVO;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -59,24 +61,22 @@
     @Autowired
     StockMapper stockMapper;
 
-    public ServerResponse<PageInfo> findMyStockOptions(String keyWords, HttpServletRequest request, int pageNum, int pageSize,String stockType) {
+    public ServerResponse<PageInfo> findMyStockOptions(String keyWords, HttpServletRequest request, int pageNum, int pageSize, String stockType) {
 
         PageHelper.startPage(pageNum, pageSize);
         User user = this.iUserService.getCurrentUser(request);
-        PageInfo pageInfo;
-        if (user == null) {
-            pageInfo =new PageInfo();
-            return ServerResponse.createBySuccessMsg("請先登錄");
-        }else{
-            List<StockOption> stockOptions = this.stockOptionMapper.findMyOptionByKeywords(user.getId(), keyWords,stockType);
-            List<StockListVO> stockOptionListVOS = Lists.newArrayList();
-            for (StockOption option : stockOptions) {
-                StockListVO stockListVO = assembleStockOptionListVO(option);
-                stockOptionListVOS.add(stockListVO);
-            }
-            pageInfo = new PageInfo(stockOptions);
-            pageInfo.setList(stockOptionListVOS);
+        RPageInfo pageInfo;
+
+        List<StockOption> stockOptions = this.stockOptionMapper.findMyOptionByKeywords(user.getId(), keyWords, stockType);
+        List<StockListVO> stockOptionListVOS = new ArrayList<>();
+
+        for (StockOption option : stockOptions) {
+            StockListVO stockListVO = assembleStockOptionListVO(option);
+            stockOptionListVOS.add(stockListVO);
         }
+        pageInfo = new RPageInfo();
+        pageInfo.setList(stockOptionListVOS);
+        pageInfo.setStockType(stockType);
         return ServerResponse.createBySuccess(pageInfo);
 
     }
@@ -88,6 +88,7 @@
         }
         return ServerResponse.createByErrorMsg("已添加");
     }
+
     public String isMyOption(Integer uid, String code) {
         StockOption stockOption = this.stockOptionMapper.isOption(uid, code);
         if (stockOption == null) {
@@ -95,6 +96,7 @@
         }
         return "1";
     }
+
     private StockListVO assembleStockOptionListVO(StockOption option) {
         Stock stock = this.stockMapper.selectByPrimaryKey(option.getStockId());
         StockListVO stockVO = StockApi.getStockRealTime(stock);

--
Gitblit v1.9.3