From c1492b5f29a0480a75cf156b09cdde34afb8ebe5 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 17:10:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 4 ++--
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 2 +-
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 5eb13b5..4e38b2e 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -95,7 +95,7 @@
config.setUserType("2");
- SysUser user=IUserService.selectData(null,config.getPhonenumber());
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
if (user != null)
{
user.setPassword(config.getPassword());
diff --git a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
index 86ed0e8..d06f550 100644
--- a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
+++ b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -68,7 +68,7 @@
HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
if(huaChengSysUser!=null && !StringUtils.isEmpty(huaChengSysUser.getUserId()) )
{
- SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone());
+ SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone(),null);
if(sysUser==null)
{
//本地没有此用户 新用户
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..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,7 +47,7 @@
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;
@@ -56,7 +56,7 @@
HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
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