From a9359a28a02e3d63487a3184587da10fbaedc904 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 17:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 86ed0e8..70888b1 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
@@ -19,6 +19,7 @@
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 自定义拦截器，判断此次请求是否有权限
@@ -65,16 +66,25 @@
//如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(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)
{
//本地没有此用户 新用户
SysUser newSysUser=new SysUser();
//默认 1系统后台用户
- newSysUser.setUserType("3");
+ newSysUser.setUserType("4");
+ newSysUser.setRoleIds("4");
+ newSysUser.setIsDivisionHead("2");
newSysUser.setPhonenumber(huaChengSysUser.getPhone());
newSysUser.setUserId(huaChengSysUser.getUserId());
newSysUser.setUserName(huaChengSysUser.getNickName());
@@ -85,6 +95,14 @@
newSysUser.setOpenid(huaChengSysUser.getOpenid());
IUserService.insertConfig(newSysUser);
}
+ else
+ {
+ if(StringUtils.isEmpty(sysUser.getOpenid()))
+ {
+ sysUser.setOpenid(huaChengSysUser.getOpenid());
+ IUserService.updateConfig(sysUser);
+ }
+ }
//新增浏览记录
iSysUserRecordService.add(sysUser);
//删除因为token问题产出的重复脏数据
--
Gitblit v1.7.1