From 0d8d525f649d2f82318d0c2b74adf6f3768744e3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 15 十月 2022 13:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
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 9ea7616..fc80d86 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
@@ -62,11 +62,11 @@
//如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
- SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"");
- if(ss==null)
+ HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
+ if(huaChengSysUser!=null && huaChengSysUser.getUserId()!=0 )
{
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
- if(huaChengSysUser!=null)
+ SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone());
+ if(sysUser==null && sysUser.getUserId()<0)
{
//本地没有此用户 新用户
SysUser newSysUser=new SysUser();
@@ -110,8 +110,8 @@
facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
facade.getWriter().write(reponse);
return false;
-// }
- }
+ }
+// }
return true;
}
}
\ No newline at end of file
--
Gitblit v1.7.1