20220505

xiaoyong931011

2022-05-05 974c9f64211c801ee113aeec0f8129ee3508f328

20220505

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

@@ -16,7 +16,6 @@
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.init.LocalCache;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -141,9 +140,9 @@
        if(ObjectUtil.isNotEmpty(user.getShopId())){
            orderListDto.setShopId(user.getShopId());
        }
        if (!DataAuthUtil.hasAllShopAuth()) {
            orderListDto.setShopId(user.getShopId());
        }
//        if (!DataAuthUtil.hasAllShopAuth()) {
//            orderListDto.setShopId(user.getShopId());
//        }
        QueryUtil.setQueryLimitCom(orderListDto);
        List<PadOrderDetailVo> padApiOrderListInPage = sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo);