From cff744d061a6badc94dccde5f15a8018bd7d3a4a Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Fri, 14 Jun 2019 09:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=92=8C=E6=97=A0=E7=A7=9F=E6=88=B7=E6=95=B0=E6=8D=AE=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/constants/BusinessConstants.java  |  6 ++-
 .../jsh/erp/controller/UserController.java    | 38 +++++++++++++------
 .../service/depotItem/DepotItemService.java   |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
index 0e7d54df..e8e0f336 100644
--- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java
+++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
@@ -212,7 +212,11 @@ public class BusinessConstants {
      * 默认管理员账号
      */
     public static final String DEFAULT_MANAGER = "admin";
-
+    /**
+     * 测试用户的基础数据设定
+     * */
+    public static final String TEST_USER_NUM_LIMIT="2000";
+    public static final String TEST_BILLS_NUM_LIMIT="200000";
 
 
 
diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java
index 2db564e7..508e62af 100644
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -107,20 +107,34 @@ public class UserController {
                         msgTip = "user can login";
                         request.getSession().setAttribute("user",user);
                         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); //单据限制数
+                            String tenantId = null;
+                            String userNumLimit = null;
+                            String billsNumLimit = null;
+                            if(user.getTenantId()==null){
+                                msgTip="用户数据错误，请联系管理员！";
+                                break;
+                            }
+                            JSONObject obj=null;
+                            if(user.getTenantId()!=-1){
+                                String url = HTTP + manageIp + ":" + managePort + "/tenant/getTenant?tenantId=" + user.getTenantId();
+                                obj = HttpClient.httpGet(url);
+                                if(obj!=null && obj.getString("code").equals(CODE_OK)) {
+                                    JSONObject dataObj = obj.getJSONObject("data");
+                                    if(dataObj!=null) {
+                                        tenantId = dataObj.getString("tenantId");
+                                        userNumLimit = dataObj.getString("userNumLimit");
+                                        billsNumLimit = dataObj.getString("billsNumLimit");
                                     }
                                 }
+                            }else{
+                                tenantId=user.getTenantId().toString();
+                                userNumLimit=BusinessConstants.TEST_USER_NUM_LIMIT;
+                                billsNumLimit=BusinessConstants.TEST_BILLS_NUM_LIMIT;
+                            }
+                            if(tenantId!=null) {
+                                request.getSession().setAttribute("tenantId",tenantId); //租户tenantId
+                                request.getSession().setAttribute("userNumLimit",userNumLimit); //用户限制数
+                                request.getSession().setAttribute("billsNumLimit",billsNumLimit); //单据限制数
                             }
                         }
                         request.getSession().setAttribute("mybatisPlusStatus",mybatisPlusStatus); //开启状态
diff --git a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
index 62243117..97baf6d6 100644
--- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -833,7 +833,7 @@ public class DepotItemService {
         Object tenantIdO = request.getSession().getAttribute("tenantId");
         if(tenantIdO!=null){
             //多租户模式，租户id从当前用户获取
-            tenantId=Long.valueOf(tenantId.toString());
+            tenantId=Long.valueOf(tenantIdO.toString());
         } else {
             //无租户模式，租户id为-1
             tenantId=Long.valueOf(-1);