From e3834d25a260cfcb239d40eed70d62e05b9c27e8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:37:27 +0800
Subject: [PATCH] 修改权限问题 bug

---
 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 d323cfa..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,19 +47,21 @@
         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+"","","");
-            sysUser=userService.selectData(null,huaChengSysUser.getPhone());
-            if(sysUser!=null)
+            if(huaChengSysUser!=null)
             {
-                return sysUser;
+                sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
+                if(sysUser!=null)
+                {
+                    return sysUser;
+                }
             }
-
         }
         return null;
 //        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);

--
Gitblit v1.7.1