From 48cf19e7043d7019404d3155f20689df6639bf5b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 18:10:53 +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, 4 insertions(+), 4 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 9ea7616..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,10 +63,10 @@
                 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();
@@ -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