From 6e6f4887eaeb046ccdc76a79375a8c7ff47daa96 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 17:52:18 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev

---
 flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java |    4 ++--
 1 files changed, 2 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 780c72d..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)
                     {
                         //本地没有此用户  新用户

--
Gitblit v1.7.1