From 07c7f39a97f4ea8f84d32e2e2075dfc9d6a1dd04 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 24 十月 2022 18:14:14 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 3a8deb0..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
@@ -66,9 +66,9 @@
request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
- if(huaChengSysUser!=null && huaChengSysUser.getUserId()!=0 )
+ 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)
{
//本地没有此用户 新用户
@@ -85,7 +85,10 @@
newSysUser.setOpenid(huaChengSysUser.getOpenid());
IUserService.insertConfig(newSysUser);
}
+ //新增浏览记录
iSysUserRecordService.add(sysUser);
+ //删除因为token问题产出的重复脏数据
+ iSysUserRecordService.deleteDistinct();
}
return true;
--
Gitblit v1.7.1