modify

wzy

2021-01-23 a672e4e8c05be9c763943a06cfe5220ef217934c

 zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java

@@ -111,11 +111,14 @@
    @RequestMapping(value = "/all")
    public @ResponseBody
    AjaxResult all(ShoppingGoodsCategory shoppingGoodsCategory) {
        SysUsers user = getMe();
        if(shoppingGoodsCategory.getShopId()==null){
            shoppingGoodsCategory.setShopId(user.getShopId());
        }
        shoppingGoodsCategory.setCompanyId(user.getCompanyId());
//        SysUsers user = getMe();
//        if(shoppingGoodsCategory.getShopId()==null){
//            shoppingGoodsCategory.setShopId(user.getShopId());
//        }
//        shoppingGoodsCategory.setCompanyId(user.getCompanyId());
        SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
        shoppingGoodsCategory.setShopId(zbShop.getId());
        QueryUtil.setQueryLimitCom(shoppingGoodsCategory);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, goodsCategoryService.findByModel(shoppingGoodsCategory), 0);
    }