From 14427ddc53a691180014321bc55a6bf7d9bb3c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 23 Jun 2021 22:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/controller/UserController.java    | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
index 28e77402..f87ccf39 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
@@ -107,33 +107,30 @@ public class UserController {
                 case ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION:
                     msgTip = "access service error";
                     break;
-                default:
-                    try {
-                        msgTip = "user can login";
-                        //验证通过 ，可以登录，放入session，记录登录日志
-                        user = userService.getUserByLoginName(loginName);
-                        if(user.getTenantId()!=null) {
-                            token = token + "_" + user.getTenantId();
-                        }
-                        redisService.storageObjectBySession(token,"userId",user.getId());
-                        if(user.getTenantId()!=null) {
-                            Tenant tenant = tenantService.getTenantByTenantId(user.getTenantId());
-                            if(tenant!=null) {
-                                Long tenantId = tenant.getTenantId();
-                                Integer userNumLimit = tenant.getUserNumLimit();
-                                Integer billsNumLimit = tenant.getBillsNumLimit();
-                                if(tenantId!=null) {
-                                    redisService.storageObjectBySession(token,"tenantId",tenantId); //租户tenantId
-                                    redisService.storageObjectBySession(token,"userNumLimit",userNumLimit); //用户限制数
-                                    redisService.storageObjectBySession(token,"billsNumLimit",billsNumLimit); //单据限制数
-                                }
+                case ExceptionCodeConstants.UserExceptionCode.USER_CONDITION_FIT:
+                    msgTip = "user can login";
+                    //验证通过 ，可以登录，放入session，记录登录日志
+                    user = userService.getUserByLoginName(loginName);
+                    if(user.getTenantId()!=null) {
+                        token = token + "_" + user.getTenantId();
+                    }
+                    redisService.storageObjectBySession(token,"userId",user.getId());
+                    if(user.getTenantId()!=null) {
+                        Tenant tenant = tenantService.getTenantByTenantId(user.getTenantId());
+                        if(tenant!=null) {
+                            Long tenantId = tenant.getTenantId();
+                            Integer userNumLimit = tenant.getUserNumLimit();
+                            Integer billsNumLimit = tenant.getBillsNumLimit();
+                            if(tenantId!=null) {
+                                redisService.storageObjectBySession(token,"tenantId",tenantId); //租户tenantId
+                                redisService.storageObjectBySession(token,"userNumLimit",userNumLimit); //用户限制数
+                                redisService.storageObjectBySession(token,"billsNumLimit",billsNumLimit); //单据限制数
                             }
                         }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        logger.error(">>>>>>>>>>>>>>>查询用户名为:" + loginName + " ，用户信息异常", e);
                     }
                     break;
+                default:
+                    break;
             }
             Map<String, Object> data = new HashMap<String, Object>();
             data.put("msgTip", msgTip);