blame | history | patch | commit | commitdiff | ignore whitespace
jyy
2021-07-17 ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 
 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java


@@ -147,7 +147,6 @@


        if (StringUtils.isBlank(pageVo.getOrder())) {


            pageVo.setOrder("desc");


        }


        projService.setShopId(getMe().getShopId());


        List<SysProjServices> dataList = projServicesSerivce.findInPage(projService, pageVo);


        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, projServicesSerivce.findTotal(projService));


        return result;


@@ -191,7 +190,6 @@


        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);


        queryUse.setTaocanId(-1L);


        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);


        queryUse.setIsOver(Dictionary.FLAG_NO_N);


        List<SysProjUse> projList = projUseService.findInPage(queryUse, null);


        //切换到套餐查询条件


        queryUse.setTaocanId(null);