diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/service/impl/OutStockoutFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/service/impl/OutStockoutFinishServiceImpl.java index 44aca27..a0c7c92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/service/impl/OutStockoutFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/service/impl/OutStockoutFinishServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.out.outStockoutFinish.service.impl; import java.util.Collections; import java.util.List; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.out.outStockout.domain.OutStockout; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -95,6 +96,7 @@ public class OutStockoutFinishServiceImpl implements IOutStockoutFinishService } @Override + @DataScope(warehouseAlias = "bw") public List selectOutStockoutFinishListByOutStockout(OutStockout outStockout) { return outStockoutFinishMapper.selectOutStockoutFinishListByOutStockout(outStockout); } diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml index b66d614..4f698e6 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml @@ -161,6 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and d.product_id = #{productId} and bp.product_name like concat('%', #{productName}, '%') and bc.customer_name like concat('%', #{customerName}, '%') + + ${params.warehouseDataScope} + order by o.create_date desc