From 5f9e2055e6b15dbb97a89ea899f685a254882ee8 Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Tue, 11 Jun 2019 14:44:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E9=87=8F=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/datasource/mappers/DepotItemMapperEx.java   |  2 +-
 .../jsh/erp/service/depotItem/DepotItemService.java | 13 ++++++++++++-
 src/main/resources/mapper_xml/DepotItemMapperEx.xml |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
index 3d010876..71a376b0 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java
@@ -176,5 +176,5 @@ public interface DepotItemMapperEx {
 
     int findStockWarningCountTotal( @Param("pid") Integer pid);
 
-    BigDecimal getCurrentRepByMaterialIdAndDepotId(@Param("materialId")Long materialId,@Param("depotId") Long depotId);
+    BigDecimal getCurrentRepByMaterialIdAndDepotId(@Param("materialId") Long materialId, @Param("depotId") Long depotId,@Param("tenantId")Long tenantId);
 }
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 5d107f3a..ac02cb01 100644
--- a/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -30,6 +30,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class DepotItemService {
@@ -819,8 +820,18 @@ public class DepotItemService {
      */
     public BigDecimal getCurrentRepByMaterialIdAndDepotId(Long materialId,Long depotId) {
         BigDecimal result = BigDecimal.ZERO;
+        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+        Long tenantId=null;
+        Object tenantIdO = request.getSession().getAttribute("tenantId");
+        if(tenantIdO!=null){
+            //多租户模式，租户id从当前用户获取
+            tenantId=Long.valueOf(tenantId.toString());
+        } else {
+            //无租户模式，租户id为-1
+            tenantId=Long.valueOf(-1);
+        }
         try{
-            result =depotItemMapperEx.getCurrentRepByMaterialIdAndDepotId(materialId,depotId);
+            result =depotItemMapperEx.getCurrentRepByMaterialIdAndDepotId(materialId,depotId,tenantId);
         }catch(Exception e){
             logger.error("异常码[{}],异常提示[{}],异常[{}]",
                     ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 545c50fd..642c9073 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -618,6 +618,8 @@
         jsh_depothead dh,jsh_depotitem di
         where 1=1
         and dh.id=di.HeaderId
+        and dh.tenant_id=#{tenantId}
+        and di.tenant_id=#{tenantId}
         and di.MaterialId=#{materialId}
         and ifnull(dh.delete_Flag,'0') !='1'
         and ifnull(di.delete_Flag,'0') !='1') as curep