From ea4dda9def8d75d5ca8796771cf22b37fcd251d1 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 07 Aug 2025 15:39:16 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/nq/controller/UserApiController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/controller/UserApiController.java b/src/main/java/com/nq/controller/UserApiController.java
index baf50d6..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,9 +12,9 @@
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.IStockConfigServices;
import com.nq.service.IUserService;
import com.nq.utils.PropertiesUtil;
@@ -29,7 +30,6 @@
import com.nq.utils.translate.GoogleTranslateUtil;
import com.nq.vo.user.UserLoginResultVO;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -71,9 +71,6 @@
@Autowired
StockConfigMapper stockConfigMapper;
-
- @Autowired
- IMoneyLogServces iMoneyLogServces;
@Autowired
MoneyLogMapper moneyLogMapper;
@@ -155,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,
@@ -164,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);
@@ -173,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