#

luxiaotao1123

2021-02-27 858075f6eed525efacfc6688886d61221a92dbf2

 src/main/java/zy/cloud/wms/manager/controller/MatController.java

@@ -46,20 +46,15 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
//        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
//        excludeTrash(param);
//        convert(param, wrapper);
//        if (!Cools.isEmpty(orderByField)){
//            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
//        }
//        Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper);
//
//        return R.ok().add(page);
        Object tagId = param.get("tag_id");
        if (Cools.isEmpty(tagId)) {
            tagId = getOriginTag().getId();
        }
        return R.ok(matService.getPage(new Page<>(curr, limit), String.valueOf(tagId)));
        return R.ok(matService.getPage(new Page<>(curr, limit)
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx"))
        );

    }