From e6b362f0b56ab17bc839ab6c8b1956c6a59a9c53 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 12 十月 2022 17:05:40 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 3595f12..bb470d5 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
@@ -63,15 +63,15 @@
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)
+ if(ss==null && ss.getUserId()<0)
{
HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
- if(huaChengSysUser!=null)
+ if(huaChengSysUser!=null && huaChengSysUser.getUserId()<0 )
{
//本地没有此用户 新用户
SysUser newSysUser=new SysUser();
//默认 1系统后台用户
- newSysUser.setUserType("1");
+ newSysUser.setUserType("3");
newSysUser.setPhonenumber(huaChengSysUser.getPhone());
newSysUser.setUserId(huaChengSysUser.getUserId());
newSysUser.setUserName(huaChengSysUser.getNickName());
@@ -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