xiaoyong931011
2022-05-07 0dd1e08859f23753682dd57968b97ff4146a0c96
zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
@@ -252,13 +252,17 @@
            pageVo.setSort("createTime");
        }
        //2表示查询总部产品
        if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) {
            //仅查询本店产品
//        if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) {
//            //仅查询本店产品
//            SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
//            //如果是总部自己查询自己的库存则不需加入这个调价
//            if (getMe().getShopId().equals(zbShop.getId())){
//                shoppingGoods.setHeadquarters(1);
//            }
//        }
            SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
            //如果是总部自己查询自己的库存则不需加入这个调价
            if (getMe().getShopId().equals(zbShop.getId())){
                shoppingGoods.setHeadquarters(1);
            }
        }
        shoppingGoods.setIsDel(ShoppingGoods.NORMAL);
        List<ShoppingGoods> dataList = shoppingGoodsService.findInPage(shoppingGoods, pageVo);