From 7c91dfbf9a20e9be807a359736b0c7a741d640ba Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 16:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 6b28405..ff9a7cb 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
@@ -47,7 +47,7 @@
Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
if (currentUserId != null) {
//从数据库中查询并返回
- SysUser sysUser=userService.selectData(currentUserId+"",null);
+ SysUser sysUser=userService.selectData(currentUserId+"",null,null);
if(sysUser!=null)
{
return sysUser;
@@ -56,7 +56,7 @@
HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
if(huaChengSysUser!=null)
{
- sysUser=userService.selectData(null,huaChengSysUser.getPhone());
+ sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
if(sysUser!=null)
{
return sysUser;
--
Gitblit v1.7.1