兼容四期

zhangc

2025-02-18 941bf6ff9bb24315dce4b9e39fb370b9fa766842

兼容四期

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -226,6 +226,11 @@
                        @RequestParam Map<String, Object> param) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        Object o = param.get("orderType");
        if (o != null) {
            wrapper.in("source", o);
            param.remove("orderType");
        }
        convert(param, wrapper);
//        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
//        List<Long> docIds = new ArrayList<>();
@@ -234,10 +239,7 @@
//                docIds.add(pakin.getDocId());
//            }
//        }
        Object o = param.get("orderType");
        if (o != null) {
            wrapper.in("source", o);
        }

        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }