From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..c95f139 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
@@ -16,6 +16,8 @@
import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.web.multipart.support.MissingServletRequestPartException;
+import java.util.List;
+
/**
* 增加方法注入，将含有CurrentUser注解的方法参数注入当前登录用户
*/
@@ -47,16 +49,23 @@
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;
}
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(currentUserId+"","","");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
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