From 464e2819756afef1228aaa7732c6ae8028be32a1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 10:06:56 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 11 ++++++++++-
1 files changed, 10 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 ff9a7cb..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注解的方法参数注入当前登录用户
*/
@@ -53,7 +55,14 @@
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(),null);
--
Gitblit v1.7.1