From d82cd28ef171d054bfa7dd8d252f570b40009656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 23 Aug 2019 23:49:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B7=A8=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsh/erp/config/TenantConfig.java          | 6 +++---
 src/main/java/com/jsh/erp/constants/ExceptionConstants.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/jsh/erp/config/TenantConfig.java b/src/main/java/com/jsh/erp/config/TenantConfig.java
index 750d3343..929d368b 100644
--- a/src/main/java/com/jsh/erp/config/TenantConfig.java
+++ b/src/main/java/com/jsh/erp/config/TenantConfig.java
@@ -83,9 +83,9 @@ public class TenantConfig {
             public boolean doFilter(MetaObject metaObject) {
                 MappedStatement ms = SqlParserHelper.getMappedStatement(metaObject);
                 // 过滤自定义查询此时无租户信息约束出现
-                //if ("com.jsh.erp.datasource.mappers.DepotHeadMapperEx.getBuildOnlyNumber".equals(ms.getId())) {
-                //    return true;
-                //}
+                if ("com.jsh.erp.datasource.mappers.UserMapperEx.getUserListByUserNameOrLoginName".equals(ms.getId())) {
+                    return true;
+                }
                 return false;
             }
         });
diff --git a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
index 4f24aafb..8902818e 100644
--- a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
+++ b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
@@ -60,10 +60,10 @@ public class ExceptionConstants {
     public static final String USER_EDIT_FAILED_MSG = "修改用户信息失败";
     //用户名已存在
     public static final int USER_USER_NAME_ALREADY_EXISTS_CODE = 500003;
-    public static final String USER_USER_NAME_ALREADY_EXISTS_MSG = "用户名已存在";
+    public static final String USER_USER_NAME_ALREADY_EXISTS_MSG = "用户名在本系统已存在";
     //登录名已存在
     public static final int USER_LOGIN_NAME_ALREADY_EXISTS_CODE = 500003;
-    public static final String USER_LOGIN_NAME_ALREADY_EXISTS_MSG = "登录名已存在";
+    public static final String USER_LOGIN_NAME_ALREADY_EXISTS_MSG = "登录名在本系统已存在";
     //用户录入数量超出限制
     public static final int USER_OVER_LIMIT_FAILED_CODE = 500004;
     public static final String USER_OVER_LIMIT_FAILED_MSG = "用户录入数量超出限制，请联系管理员续费";