From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 4294cae..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
@@ -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,8 +47,23 @@
Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
if (currentUserId != null) {
//从数据库中查询并返回
- return userService.getUserById(currentUserId);
+ SysUser sysUser=userService.selectData(currentUserId+"",null,null);
+ if(sysUser!=null)
+ {
+ return sysUser;
+ }
+
+ HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
+ if(huaChengSysUser!=null)
+ {
+ sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
+ if(sysUser!=null)
+ {
+ return sysUser;
+ }
+ }
}
- throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
+ return null;
+// throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
}
}
--
Gitblit v1.7.1