diff --git a/erp_web/js/pages/materials/allocation_out_list.js b/erp_web/js/pages/materials/allocation_out_list.js
index 799b2376..59ce6b70 100644
--- a/erp_web/js/pages/materials/allocation_out_list.js
+++ b/erp_web/js/pages/materials/allocation_out_list.js
@@ -1939,6 +1939,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -1949,8 +1957,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/assemble_list.js b/erp_web/js/pages/materials/assemble_list.js
index 647e7a8d..b0ee8d79 100644
--- a/erp_web/js/pages/materials/assemble_list.js
+++ b/erp_web/js/pages/materials/assemble_list.js
@@ -1937,6 +1937,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -1947,8 +1955,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/disassemble_list.js b/erp_web/js/pages/materials/disassemble_list.js
index 7132076d..a70e6dfd 100644
--- a/erp_web/js/pages/materials/disassemble_list.js
+++ b/erp_web/js/pages/materials/disassemble_list.js
@@ -1941,6 +1941,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -1951,8 +1959,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/other_in_list.js b/erp_web/js/pages/materials/other_in_list.js
index ed8eadac..6fdc038a 100644
--- a/erp_web/js/pages/materials/other_in_list.js
+++ b/erp_web/js/pages/materials/other_in_list.js
@@ -2025,6 +2025,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -2035,8 +2043,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/other_out_list.js b/erp_web/js/pages/materials/other_out_list.js
index bab7afd2..abb4c78e 100644
--- a/erp_web/js/pages/materials/other_out_list.js
+++ b/erp_web/js/pages/materials/other_out_list.js
@@ -1935,6 +1935,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -1945,8 +1953,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/purchase_back_list.js b/erp_web/js/pages/materials/purchase_back_list.js
index 932f3474..6ea49a65 100644
--- a/erp_web/js/pages/materials/purchase_back_list.js
+++ b/erp_web/js/pages/materials/purchase_back_list.js
@@ -1975,6 +1975,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -1985,8 +1993,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/purchase_in_list.js b/erp_web/js/pages/materials/purchase_in_list.js
index 4d604f3a..edaa8d68 100644
--- a/erp_web/js/pages/materials/purchase_in_list.js
+++ b/erp_web/js/pages/materials/purchase_in_list.js
@@ -2051,6 +2051,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -2061,8 +2069,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/purchase_orders_list.js b/erp_web/js/pages/materials/purchase_orders_list.js
index f6d9a70e..3a014b34 100644
--- a/erp_web/js/pages/materials/purchase_orders_list.js
+++ b/erp_web/js/pages/materials/purchase_orders_list.js
@@ -2047,6 +2047,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -2057,8 +2065,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/retail_back_list.js b/erp_web/js/pages/materials/retail_back_list.js
index 8f65b1ed..1cb329b8 100644
--- a/erp_web/js/pages/materials/retail_back_list.js
+++ b/erp_web/js/pages/materials/retail_back_list.js
@@ -2059,6 +2059,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -2069,8 +2077,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/retail_out_list.js b/erp_web/js/pages/materials/retail_out_list.js
index e381d946..bf142668 100644
--- a/erp_web/js/pages/materials/retail_out_list.js
+++ b/erp_web/js/pages/materials/retail_out_list.js
@@ -2165,6 +2165,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -2175,8 +2183,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/sale_back_list.js b/erp_web/js/pages/materials/sale_back_list.js
index b52de66d..55566a00 100644
--- a/erp_web/js/pages/materials/sale_back_list.js
+++ b/erp_web/js/pages/materials/sale_back_list.js
@@ -2027,6 +2027,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -2037,8 +2045,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/sale_orders_list.js b/erp_web/js/pages/materials/sale_orders_list.js
index 41803f17..5b6ead1d 100644
--- a/erp_web/js/pages/materials/sale_orders_list.js
+++ b/erp_web/js/pages/materials/sale_orders_list.js
@@ -2044,6 +2044,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -2054,8 +2062,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/erp_web/js/pages/materials/sale_out_list.js b/erp_web/js/pages/materials/sale_out_list.js
index 210c47bc..7cd04788 100644
--- a/erp_web/js/pages/materials/sale_out_list.js
+++ b/erp_web/js/pages/materials/sale_out_list.js
@@ -2098,6 +2098,14 @@ function bindEvent(){
 
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
+    var beginTime = $.trim($("#searchBeginTime").val());
+    var endTime = $.trim($("#searchEndTime").val());
+    if(beginTime) {
+        beginTime = beginTime + ' 00:00:00';
+    }
+    if(endTime) {
+        endTime = endTime + ' 23:59:59';
+    }
     $.ajax({
         type: "get",
         url: "/depotHead/list",
@@ -2108,8 +2116,8 @@ function showDepotHeadDetails(pageNo,pageSize){
                 subType: listSubType,
                 state: $.trim($("#searchState").val()),
                 number: $.trim($("#searchNumber").val()),
-                beginTime: $("#searchBeginTime").val(),
-                endTime: $("#searchEndTime").val(),
+                beginTime: beginTime,
+                endTime: endTime,
                 materialParam: materialParam,
                 depotIds: depotString
             }),
diff --git a/sql/jsh_erp(后续更新参考这个更新).sql b/sql/jsh_erp(后续更新参考这个更新).sql
index e8c8ed5c..9fd03f74 100644
--- a/sql/jsh_erp(后续更新参考这个更新).sql
+++ b/sql/jsh_erp(后续更新参考这个更新).sql
@@ -1728,4 +1728,39 @@ where Id = 5;
 update jsh_app SET Number = '02' where name='个人信息';
 insert into `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`)
 select '02', '个人信息', '0', '', b'1', '0005', b'1', '电脑版', '' from dual where not exists
-(select * from jsh_functions where  Number='02' and PNumber='0');
\ No newline at end of file
+(select * from jsh_functions where  Number='02' and PNumber='0');
+-- ----------------------------
+-- 时间：2019年6月4日
+-- version：1.0.15
+-- 此次更新
+-- 更新无租户数据的租户id为-1，以保证无租户和有租户数据能够共存
+-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
+-- ----------------------------
+update databasechangelog set tenant_id=-1  where tenant_id is null;
+update databasechangeloglock set tenant_id=-1  where tenant_id is null;
+update jsh_account set tenant_id=-1  where tenant_id is null;
+update jsh_accounthead set tenant_id=-1  where tenant_id is null;
+update jsh_accountitem set tenant_id=-1  where tenant_id is null;
+update jsh_app set tenant_id=-1  where tenant_id is null;
+update jsh_asset set tenant_id=-1  where tenant_id is null;
+update jsh_assetcategory set tenant_id=-1  where tenant_id is null;
+update jsh_assetname set tenant_id=-1  where tenant_id is null;
+update jsh_depot set tenant_id=-1  where tenant_id is null;
+update jsh_depothead set tenant_id=-1  where tenant_id is null;
+update jsh_depotitem set tenant_id=-1  where tenant_id is null;
+update jsh_functions set tenant_id=-1  where tenant_id is null;
+update jsh_inoutitem set tenant_id=-1  where tenant_id is null;
+update jsh_log set tenant_id=-1  where tenant_id is null;
+update jsh_material set tenant_id=-1  where tenant_id is null;
+update jsh_materialcategory set tenant_id=-1  where tenant_id is null;
+update jsh_materialproperty set tenant_id=-1  where tenant_id is null;
+update jsh_orga_user_rel set tenant_id=-1  where tenant_id is null;
+update jsh_organization set tenant_id=-1  where tenant_id is null;
+update jsh_person set tenant_id=-1  where tenant_id is null;
+update jsh_role set tenant_id=-1  where tenant_id is null;
+update jsh_serial_number set tenant_id=-1  where tenant_id is null;
+update jsh_supplier set tenant_id=-1  where tenant_id is null;
+update jsh_systemconfig set tenant_id=-1  where tenant_id is null;
+update jsh_unit set tenant_id=-1  where tenant_id is null;
+update jsh_user set tenant_id=-1  where tenant_id is null;
+update jsh_userbusiness set tenant_id=-1  where tenant_id is null;
\ No newline at end of file
diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx
index 4afff99a..094a53a9 100644
Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ
diff --git a/src/main/java/com/jsh/erp/config/TenantConfig.java b/src/main/java/com/jsh/erp/config/TenantConfig.java
index 8a22fdf1..d270cf78 100644
--- a/src/main/java/com/jsh/erp/config/TenantConfig.java
+++ b/src/main/java/com/jsh/erp/config/TenantConfig.java
@@ -28,8 +28,7 @@ public class TenantConfig {
      * description:
      * 实现多租户和无租户模式数据可以兼容在一个数据库中
      * 多租户模式：根据tenant_id=租户id来筛选个人数据
-     * 无租户模式：根据tenant_id is null来筛选数据
-     * mybatis-plus不支持多租户租户同时id为null的情况
+     * 无租户模式：根据tenant_id=-1来筛选数据
      */
     @Bean
     public PaginationInterceptor paginationInterceptor(HttpServletRequest request) {
@@ -45,8 +44,8 @@ public class TenantConfig {
                     //多租户模式，租户id从当前用户获取
                     return new LongValue(Long.parseLong(tenantId.toString()));
                 } else {
-                    //多租户模式，租户id为null
-                    return null;
+                    //无租户模式，租户id为-1
+                    return new LongValue(Long.valueOf(-1));
                 }
             }
 
@@ -57,19 +56,11 @@ public class TenantConfig {
 
             @Override
             public boolean doTableFilter(String tableName) {
-                //获取开启状态
-                Object mybatisPlusStatus = request.getSession().getAttribute("mybatisPlusStatus");
-                if(mybatisPlusStatus !=null && mybatisPlusStatus.toString().equals("open")) {
-                    //从session中获取租户id
-                    // 这里可以判断是否过滤表
-                    if ("tbl_sequence".equals(tableName) || "dual".equals(tableName)) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    //无租户模式
+                // 这里可以判断是否过滤表
+                if ("tbl_sequence".equals(tableName) || "dual".equals(tableName)) {
                     return true;
+                } else {
+                    return false;
                 }
             }
         });
@@ -80,19 +71,14 @@ public class TenantConfig {
             @Override
             public boolean doFilter(MetaObject metaObject) {
                 MappedStatement ms = SqlParserHelper.getMappedStatement(metaObject);
-                //获取开启状态
-                Object mybatisPlusStatus = request.getSession().getAttribute("mybatisPlusStatus");
-                if(mybatisPlusStatus !=null && mybatisPlusStatus.toString().equals("open")) {
-                    //多租户模式
-                    // 过滤自定义查询，此处跳过指定id的查询（不追加租户id过滤条件）
-                    if ("com.jsh.erp.datasource.mappers.UserMapperEx.getUserListByUserNameOrLoginName".equals(ms.getId())) {
-                        return true;
-                    }
-                    return false;
-                } else {
-                    //无租户模式
+                // 过滤自定义查询，此处跳过指定id的查询（不追加租户id过滤条件）
+                if ("com.jsh.erp.datasource.mappers.UserMapperEx.getUserListByLoginName".equals(ms.getId())||
+                        "com.jsh.erp.datasource.mappers.UserMapperEx.getUserListByloginNameAndPassword".equals(ms.getId())||
+                        "com.jsh.erp.datasource.mappers.DepotItemMapperEx.getCurrentRepByMaterialIdAndDepotId".equals(ms.getId())) {
                     return true;
                 }
+                return false;
+
             }
         });
         return paginationInterceptor;
diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java
index 338cf3f9..2db564e7 100644
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -101,7 +101,7 @@ public class UserController {
                 default:
                     try {
                         //验证通过 ，可以登录，放入session，记录登录日志
-                        user = userService.getUserByUserName(username);
+                        user = userService.getUserListByloginNameAndPassword(username,password);
     //                    logService.create(new Logdetails(user, "登录系统", model.getClientIp(),
     //                            new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统"));
                         msgTip = "user can login";
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
index 94999188..89892ff3 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
@@ -32,9 +32,7 @@ public interface UserMapperEx {
     /**
      * 这个查询不添加租户id，保证登录名全局唯一
      * */
-    @SqlParser(filter = true)
-    List<User> getUserListByUserNameOrLoginName(@Param("userName") String userName,
-                                                @Param("loginame") String loginame);
+    List<User> getUserListByLoginName(@Param("loginame") String loginame);
 
     int batDeleteOrUpdateUser(@Param("ids") String ids[], @Param("status") byte status);
 
@@ -44,4 +42,5 @@ public interface UserMapperEx {
     List<User> getUserListByUserNameAndTenantId(@Param("userName")String userName, @Param("tenantId")Long tenantId);
 
     String addRegisterUserNotInclueUser(@Param("userId") Long userId,@Param("tenantId") Long tenantId,@Param("roleId") Long roleId);
+    List<User> getUserListByloginNameAndPassword(@Param("loginame")String loginame, @Param("password")String password);
 }
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java
index 478ece12..c191ef5b 100644
--- a/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -252,12 +252,10 @@ public class UserService {
             /**默认是可以登录的*/
             List<User> list = null;
             try {
-                UserExample example = new UserExample();
-                example.createCriteria().andLoginameEqualTo(username);
-                list = userMapper.selectByExample(example);
+                list=this.getUserListByloginName(username);
             } catch (Exception e) {
                 logger.error("异常码[{}],异常提示[{}],异常[{}]",
-                        ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
+                        ExceptionConstants.DATA_READ_FAIL_CODE, ExceptionConstants.DATA_READ_FAIL_MSG,e);
                 logger.error(">>>>>>>>访问验证用户姓名是否存在后台信息异常", e);
                 return ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION;
             }
@@ -265,17 +263,15 @@ public class UserService {
             if (null != list && list.size() == 0) {
                 return ExceptionCodeConstants.UserExceptionCode.USER_NOT_EXIST;
             }
-
+            User user=null;
             try {
-                UserExample example = new UserExample();
-                example.createCriteria().andLoginameEqualTo(username).andPasswordEqualTo(password);
-                list = userMapper.selectByExample(example);
+                user = this.getUserListByloginNameAndPassword(username,password);
             } catch (Exception e) {
                 logger.error(">>>>>>>>>>访问验证用户密码后台信息异常", e);
                 return ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION;
             }
 
-            if (null != list && list.size() == 0) {
+            if (null == user ) {
                 return ExceptionCodeConstants.UserExceptionCode.USER_PASSWORD_ERROR;
             }
             return ExceptionCodeConstants.UserExceptionCode.USER_CONDITION_FIT;
@@ -663,15 +659,33 @@ public class UserService {
     public List<User> getUserListByloginName(String loginName){
         List<User> list =null;
         try{
-            list=userMapperEx.getUserListByUserNameOrLoginName(null,loginName);
+            list=userMapperEx.getUserListByLoginName(loginName);
         }catch(Exception e){
             logger.error("异常码[{}],异常提示[{}],异常[{}]",
-                    ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
+                    ExceptionConstants.DATA_READ_FAIL_CODE, ExceptionConstants.DATA_READ_FAIL_MSG,e);
             throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE,
                     ExceptionConstants.DATA_READ_FAIL_MSG);
         }
         return list;
     }
+    /**
+     * 通过登录名和密码获取用户列表
+     * */
+    public User getUserListByloginNameAndPassword(String loginName,String password){
+        List<User> list =null;
+        try{
+            list=userMapperEx.getUserListByloginNameAndPassword(loginName,password);
+        }catch(Exception e){
+            logger.error("异常码[{}],异常提示[{}],异常[{}]",
+                    ExceptionConstants.DATA_READ_FAIL_CODE, ExceptionConstants.DATA_READ_FAIL_MSG,e);
+            throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE,
+                    ExceptionConstants.DATA_READ_FAIL_MSG);
+        }
+        if(list!=null&&list.size()>0){
+            return list.get(0);
+        }
+        return null;
+    }
     /**
      * 批量删除用户
      * */
diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 636b6601..307d7aec 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -49,6 +49,8 @@
         left join jsh_person p on dh.HandsPersonId=p.id and ifnull(p.delete_Flag,'0') !='1'
         left join jsh_account a on dh.AccountId=a.id and ifnull(a.delete_Flag,'0') !='1'
         left join jsh_depot dd on dh.AllocationProjectId=dd.id and ifnull(dd.delete_Flag,'0') !='1'
+        inner join jsh_depotitem di on dh.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
+        inner join jsh_material m on di.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1'
         where 1=1
         <if test="type != null and type != ''">
             and dh.Type=#{type}
@@ -66,6 +68,12 @@
         <if test="endTime != null and endTime != ''">
             and dh.OperTime &lt;= #{endTime}
         </if>
+        <if test="materialParam != null">
+            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        </if>
+        <if test="depotIds != null">
+            and di.DepotId in (${depotIds})
+        </if>
         and ifnull(dh.delete_Flag,'0') !='1'
         order by dh.Id desc
         <if test="offset != null and rows != null">
@@ -74,24 +82,26 @@
     </select>
     <select id="countsByDepotHead" resultType="java.lang.Long">
         SELECT
-        COUNT(id)
-        FROM jsh_depothead
+        COUNT(dh.id)
+        FROM jsh_depothead dh
+        inner join jsh_depotitem di on dh.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
+        inner join jsh_material m on di.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1'
         WHERE 1=1
         <if test="type != null and type != ''">
-            and Type=#{type}
+            and dh.Type=#{type}
         </if>
         <if test="subType != null and subType != ''">
-            and SubType=#{subType}
+            and dh.SubType=#{subType}
         </if>
         <if test="number != null and number != ''">
             <bind name="number" value="'%' + _parameter.number + '%'"/>
-            and Number like #{number}
+            and dh.Number like #{number}
         </if>
         <if test="beginTime != null and beginTime != ''">
-            and OperTime >= #{beginTime}
+            and dh.OperTime >= #{beginTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and OperTime &lt;= #{endTime}
+            and dh.OperTime &lt;= #{endTime}
         </if>
         <if test="materialParam != null">
             and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
@@ -99,7 +109,7 @@
         <if test="depotIds != null">
             and di.DepotId in (${depotIds})
         </if>
-        and ifnull(jsh_depothead.delete_Flag,'0') !='1'
+        and ifnull(dh.delete_Flag,'0') !='1'
     </select>
 
 
diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 403d2741..57f27f7f 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -606,7 +606,7 @@
     and dh.id=di.HeaderId
     and di.MaterialId=#{materialId}
     and ifnull(dh.delete_Flag,'0') !='1'
-    and ifnull(di.delete_Flag,'0') !='1') curep
+    and ifnull(di.delete_Flag,'0') !='1')  curep
     </select>
 
 </mapper>
diff --git a/src/main/resources/mapper_xml/UserMapperEx.xml b/src/main/resources/mapper_xml/UserMapperEx.xml
index 7a0a274a..f6b49674 100644
--- a/src/main/resources/mapper_xml/UserMapperEx.xml
+++ b/src/main/resources/mapper_xml/UserMapperEx.xml
@@ -116,15 +116,12 @@
         </set>
         where id = #{id,jdbcType=BIGINT}
     </update>
-    <select id="getUserListByUserNameOrLoginName" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
+    <select id="getUserListByLoginName" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
         select user.id, user.username, user.loginame, user.position, user.email, user.phonenum,
-        user.description, user.remark,user.isystem
+        user.description, user.remark,user.isystem,user.tenant_id
         FROM jsh_user user
         where 1=1
         and ifnull(user.status,'0') not in('1','2')
-        <if test="userName != null and userName != ''">
-            and user.userName = #{userName}
-        </if>
         <if test="loginame != null and loginame != ''">
             and user.loginame = #{loginame}
         </if>
@@ -213,6 +210,20 @@
     <select id="addRegisterUserNotInclueUser" resultType="java.lang.String">
       select registerUserTemplate(#{userId},#{tenantId},#{roleId}) from dual;
     </select>
+    <select id="getUserListByloginNameAndPassword" resultMap="com.jsh.erp.datasource.mappers.UserMapper.BaseResultMap">
+        select user.id, user.username, user.loginame, user.position, user.email, user.phonenum,
+        user.description, user.remark,user.isystem,user.tenant_id
+        FROM jsh_user user
+        where 1=1
+        and ifnull(user.status,'0') not in('1','2')
+        <if test="loginame != null and loginame != ''">
+            and user.loginame = #{loginame}
+        </if>
+        <if test="password != null and password != ''">
+            and user.password = #{password}
+        </if>
+        order by user.id desc
+    </select>
 
 
 </mapper>
\ No newline at end of file