From 093e423a4f7718fb7b3d811d8786251586302278 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 31 Jul 2025 17:56:24 +0800
Subject: [PATCH] 资金记录修改

---
 src/main/java/com/nq/controller/UserApiController.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nq/controller/UserApiController.java b/src/main/java/com/nq/controller/UserApiController.java
index 1180623..5c4ab40 100644
--- a/src/main/java/com/nq/controller/UserApiController.java
+++ b/src/main/java/com/nq/controller/UserApiController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nq.common.ResponseCode;
 import com.nq.common.ServerResponse;
 
 import com.nq.dao.MoneyLogMapper;
@@ -11,6 +12,7 @@
 import com.nq.pojo.MoneyLog;
 import com.nq.pojo.SiteSpread;
 import com.nq.pojo.StockConfig;
+import com.nq.pojo.User;
 import com.nq.service.IMoneyLogServces;
 import com.nq.service.ISiteSpreadService;
 import com.nq.service.IUserService;
@@ -150,7 +152,7 @@
 
     @RequestMapping({"moneylogAll.do"})
     @ResponseBody
-    public ServerResponse taskList(@RequestParam(value = "userId") String userId,
+    public ServerResponse taskList(@RequestParam(value = "userId", required = false) String userId,
                                    @RequestParam(value = "type", required = false) String type,
                                    @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "50") int pageSize,
@@ -159,7 +161,13 @@
         QueryWrapper<MoneyLog> queryWrapper = new QueryWrapper<>();
 
         if(!TextUtils.isEmpty(userId)){
-            queryWrapper.eq("user_id",userId);
+            queryWrapper.eq("user_id", userId);
+        } else {
+            User user = iUserService.getCurrentUser(request);
+            if (user == null ){
+                return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录", request);
+            }
+            queryWrapper.eq("user_id", user.getId());
         }
         if(StringUtils.isNotEmpty(type)){
             queryWrapper.eq("type",type);
@@ -168,7 +176,7 @@
         Page<MoneyLog> moneyLogPage = moneyLogMapper.selectPage(page1, queryWrapper);
         List<MoneyLog> records = moneyLogPage.getRecords();
         records.forEach(f->{
-            f.setDescs( new GoogleTranslateUtil().translate(f.getDescs(),request.getHeader("lang")));
+            f.setDescs( new GoogleTranslateUtil().translate(f.getDescs(), request.getHeader("lang")));
         });
         moneyLogPage.setRecords(records);
         return ServerResponse.createBySuccess(moneyLogPage);

--
Gitblit v1.9.3