1

jyy

2021-06-08 4ace4d28e01a4265a0d5df214459b603b8e3cfda

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

@@ -176,8 +176,11 @@
    public @ResponseBody
    AjaxResult showList(ShoppingGoods shoppingGoods, PaginationVO pageVo) {
        QueryUtil.setQueryLimit(shoppingGoods);
        pageVo.setOrder("desc");
        pageVo.setSort("createTime");
       if(StringUtils.isBlank(pageVo.getSort())){
           pageVo.setOrder("desc");
           pageVo.setSort("createTime");
       }

        //2表示查询总部产品
        if (shoppingGoods.getHeadquarters()!=null && 2==shoppingGoods.getHeadquarters()) {
            //仅查询本店产品