From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 9988d32..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
@@ -74,7 +74,6 @@
huaChengSysUser=list.get(0);
}
-
if(huaChengSysUser!=null && !StringUtils.isEmpty(huaChengSysUser.getUserId()) )
{
SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone(),null);
@@ -85,6 +84,7 @@
//默认 1系统后台用户
newSysUser.setUserType("4");
newSysUser.setRoleIds("4");
+ newSysUser.setIsDivisionHead("2");
newSysUser.setPhonenumber(huaChengSysUser.getPhone());
newSysUser.setUserId(huaChengSysUser.getUserId());
newSysUser.setUserName(huaChengSysUser.getNickName());
@@ -95,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