From d4475d0e8d36a75980899246202ea420c3fad935 Mon Sep 17 00:00:00 2001
From: abbfun <819589789@qq.com>
Date: 星期三, 27 七月 2022 17:05:31 +0800
Subject: [PATCH] 优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出) 无搜索条件时可通过search隐藏搜索按钮,工具条组右侧样式超出5px(相对于底部表格),其父节点gutter代码生成默认10,此处也默认10,使工具组样式左右一致

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index 43faf64..575bd8d 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -10,7 +10,7 @@
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.exception.BaseException;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysUserService;
 
@@ -37,17 +37,17 @@
         if (StringUtils.isNull(user))
         {
             log.info("登录用户:{} 不存在.", username);
-            throw new UsernameNotFoundException("登录用户:" + username + " 不存在");
+            throw new ServiceException("登录用户:" + username + " 不存在");
         }
         else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {
             log.info("登录用户:{} 已被删除.", username);
-            throw new BaseException("对不起,您的账号:" + username + " 已被删除");
+            throw new ServiceException("对不起,您的账号:" + username + " 已被删除");
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
             log.info("登录用户:{} 已被停用.", username);
-            throw new BaseException("对不起,您的账号:" + username + " 已停用");
+            throw new ServiceException("对不起,您的账号:" + username + " 已停用");
         }
 
         return createLoginUser(user);

--
Gitblit v1.9.2