20220505

xiaoyong931011

2022-05-05 5a3242a93a5920a2510288d7ff671d883710df2f

20220505

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java

@@ -18,7 +18,6 @@
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
@@ -143,7 +142,11 @@
//        if (!DataAuthUtil.hasAllShopAuth()) {
//            orderListDto.setShopId(user.getShopId());
//        }
        QueryUtil.setQueryLimitCom(orderListDto);

        if(ObjectUtil.isNotEmpty(user.getCompanyId())){
            orderListDto.setCompanyId(user.getCompanyId());
        }
//        QueryUtil.setQueryLimitCom(orderListDto);
        List<PadOrderDetailVo> padApiOrderListInPage = sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo);

        AjaxResult result = AjaxResult.buildSuccessInstance("");