From d323ac1bcf18215d6f96c4db82319be745950fe7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 14 十月 2022 14:24:53 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev

---
 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
index 269b9f5..d83d2af 100644
--- a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
+++ b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
@@ -39,7 +39,7 @@
         Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
         if (currentUserId != null) {
             //从数据库中查询并返回
-            return userService.selectData(currentUserId+"");
+            return userService.selectData(currentUserId+"",null);
         }
         return null;
 //        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);

--
Gitblit v1.7.1