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 | 8 ++++++--
1 files changed, 6 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 a31de36..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
@@ -84,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());
@@ -96,8 +97,11 @@
}
else
{
- sysUser.setOpenid(huaChengSysUser.getOpenid());
- IUserService.updateConfig(sysUser);
+ if(StringUtils.isEmpty(sysUser.getOpenid()))
+ {
+ sysUser.setOpenid(huaChengSysUser.getOpenid());
+ IUserService.updateConfig(sysUser);
+ }
}
//新增浏览记录
iSysUserRecordService.add(sysUser);
--
Gitblit v1.7.1