From 77f33d899f8844c903d4ac3766537752aaec0ece Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 15 十月 2022 16:37:49 +0800
Subject: [PATCH] 修改小程序获取不到用户信息 bug

---
 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java |   22 +++++++++++++++++++++-
 1 files changed, 21 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 d83d2af..d323cfa 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
@@ -2,7 +2,9 @@
 
 import com.dg.core.Constant;
 import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
 import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IHuaChengSysUserService;
 import com.dg.core.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
@@ -23,6 +25,12 @@
     @Autowired
     private ISysUserService userService;
 
+    /**
+     * 花城e+用户接口
+     */
+    @Autowired
+    IHuaChengSysUserService iHuaChengSysUserService;
+
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
         //如果参数类型是User并且有CurrentUser注解则支持
@@ -39,7 +47,19 @@
         Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
         if (currentUserId != null) {
             //从数据库中查询并返回
-            return userService.selectData(currentUserId+"",null);
+            SysUser sysUser=userService.selectData(currentUserId+"",null);
+            if(sysUser!=null)
+            {
+                return sysUser;
+            }
+
+            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
+            sysUser=userService.selectData(null,huaChengSysUser.getPhone());
+            if(sysUser!=null)
+            {
+                return sysUser;
+            }
+
         }
         return null;
 //        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);

--
Gitblit v1.7.1