From e01c52a7973d24e51b8d58afd5c78b23cca1c66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
 <852955+jishenghua@users.noreply.gitee.com>
Date: Tue, 2 Apr 2019 22:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=8E=B7=E5=8F=96=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF=E7=9A=84issue?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/controller/UserController.java    | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java
index 5c2eefdc..3973166d 100644
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -113,18 +113,20 @@ public class UserController {
     //                            new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统"));
                         msgTip = "user can login";
                         request.getSession().setAttribute("user",user);
-                        String url = HTTP + manageIp + ":" + managePort + "/tenant/getTenant?tenantId=" + user.getTenantId();
-                        JSONObject obj = HttpClient.httpGet(url);
-                        if(obj!=null && obj.getString("code").equals(CODE_OK)) {
-                            JSONObject dataObj = obj.getJSONObject("data");
-                            if(dataObj!=null) {
-                                String tenantId = dataObj.getString("tenantId");
-                                String userNumLimit = dataObj.getString("userNumLimit");
-                                String billsNumLimit = dataObj.getString("billsNumLimit");
-                                if(tenantId!=null) {
-                                    request.getSession().setAttribute("tenantId",tenantId); //租户tenantId
-                                    request.getSession().setAttribute("userNumLimit",userNumLimit); //用户限制数
-                                    request.getSession().setAttribute("billsNumLimit",billsNumLimit); //单据限制数
+                        if(("open").equals(mybatisPlusStatus)) {
+                            String url = HTTP + manageIp + ":" + managePort + "/tenant/getTenant?tenantId=" + user.getTenantId();
+                            JSONObject obj = HttpClient.httpGet(url);
+                            if(obj!=null && obj.getString("code").equals(CODE_OK)) {
+                                JSONObject dataObj = obj.getJSONObject("data");
+                                if(dataObj!=null) {
+                                    String tenantId = dataObj.getString("tenantId");
+                                    String userNumLimit = dataObj.getString("userNumLimit");
+                                    String billsNumLimit = dataObj.getString("billsNumLimit");
+                                    if(tenantId!=null) {
+                                        request.getSession().setAttribute("tenantId",tenantId); //租户tenantId
+                                        request.getSession().setAttribute("userNumLimit",userNumLimit); //用户限制数
+                                        request.getSession().setAttribute("billsNumLimit",billsNumLimit); //单据限制数
+                                    }
                                 }
                             }
                         }
@@ -180,10 +182,12 @@ public class UserController {
         BaseResponseInfo res = new BaseResponseInfo();
         try {
             request.getSession().removeAttribute("user");
-            request.getSession().removeAttribute("tenantId");
-            request.getSession().removeAttribute("userNumLimit");
-            request.getSession().removeAttribute("billsNumLimit");
             request.getSession().removeAttribute("mybatisPlusStatus");
+            if(("open").equals(mybatisPlusStatus)) {
+                request.getSession().removeAttribute("tenantId");
+                request.getSession().removeAttribute("userNumLimit");
+                request.getSession().removeAttribute("billsNumLimit");
+            }
             response.sendRedirect("/login.html");
         } catch(Exception e){
             e.printStackTrace();