0615

src/main/java/cn/ezhizao/project/business/takeStockPeriod/controller/BizTakeStockPeriodController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.ezhizao.common.utils.poi.ExcelUtil;
@@ -41,6 +42,8 @@ public class BizTakeStockPeriodController extends BaseController
     private IBizTakeStockPeriodService bizTakeStockPeriodService;
     @Resource
     private IBizTaksStockLotService bizTaksStockLotService;
+    @Resource
+    private HttpServletRequest request;
 
     /**
      * 查询盘点时间列表
@@ -72,7 +75,8 @@ public class BizTakeStockPeriodController extends BaseController
     @Log(title = "判断是否在盘点状态", businessType = BusinessType.SELECT)
     public AjaxResult isTakeStock()
     {
-        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).one();
+        Long tenantId = Long.parseLong(request.getHeader("tenantId"));
+        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).eq("tenant_id",tenantId).one();
         if(bizTakeStockPeriod!=null && bizTakeStockPeriod.getStatus() == 1) {
             return success(true);
         }